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

misc function renaming

Browse Source
This commit is contained in:
theo
2020-06-11 02:52:05 -07:00
parent ada93e7653
commit 6f91fbbdb9
174 changed files with 1153 additions and 1136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/acroBandits.s
+2 -2
View File
@@ -711,7 +711,7 @@ sub_08031DA0: @ 0x08031DA0
cmp r2, #0x50
bne _08031DBA
adds r0, r1, #0
bl sub_0805E7BC
bl DeleteEntity
b _08031DC2
_08031DBA:
movs r0, #1
@@ -1349,7 +1349,7 @@ sub_08032248: @ 0x08032248
subs r0, #1
strb r0, [r1, #0xe]
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _0803228E
_08032276:
adds r0, r4, #0
asm/armos.s
+8 -8
View File
@@ -893,7 +893,7 @@ sub_080307EC: @ 0x080307EC
ldr r0, _08030830 @ =0x00004022
ldrb r2, [r6]
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_0803082C: .4byte gRoomControls
@@ -924,7 +924,7 @@ sub_08030834: @ 0x08030834
adds r0, #0x38
ldrb r2, [r0]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_08030868: .4byte gRoomControls
@@ -984,7 +984,7 @@ _0803088E:
mov r8, r0
ldrb r1, [r0]
adds r0, r4, #0
bl sub_080002B0
bl GetTileType
ldr r1, _08030930 @ =0x00004049
mov sl, r1
cmp r0, sl
@@ -993,14 +993,14 @@ _0803088E:
adds r1, r6, #0
movs r2, #2
movs r3, #0xc
bl sub_0800293E
bl CheckPlayerInRegion
cmp r0, #0
beq _0803093C
subs r1, r6, #4
adds r0, r7, #0
movs r2, #2
movs r3, #4
bl sub_0800293E
bl CheckPlayerInRegion
cmp r0, #0
beq _0803098A
ldr r2, _08030934 @ =gLinkEntity
@@ -1033,7 +1033,7 @@ _0803093C:
mov r3, r8
ldrb r2, [r3]
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
b _0803098A
.align 2, 0
_0803094C: .4byte 0x00004022
@@ -1042,7 +1042,7 @@ _08030950:
adds r0, r7, #0
movs r2, #2
movs r3, #5
bl sub_0800293E
bl CheckPlayerInRegion
cmp r0, #0
beq _0803098A
movs r4, #0x2e
@@ -1064,7 +1064,7 @@ _08030950:
mov r0, r8
ldrb r2, [r0]
mov r0, sl
bl UpdateCollisionLayer
bl SetTile
_0803098A:
adds r2, r5, #0
adds r2, #0x29
asm/bakerOven.s
+8 -8
View File
@@ -245,42 +245,42 @@ sub_0809CDF0: @ 0x0809CDF0
subs r1, r6, #1
adds r4, #0x38
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldr r5, _0809CE88 @ =0x00004022
ldrb r2, [r4]
adds r0, r5, #0
adds r1, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #1
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r5, #4
adds r1, r6, #0
subs r1, #0x41
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
subs r1, #0x40
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809CE8C @ =0x00004024
adds r1, r6, #0
subs r1, #0x3f
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
subs r1, #0x81
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
subs r1, #0x80
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_0809CE80: .4byte gRoomControls
asm/beanstalk.s
+6 -6
View File
@@ -505,7 +505,7 @@ _0808A0A8:
cmp r0, #0
bge _0808A0BA
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_0808A0BA:
pop {r4, r5, pc}
.align 2, 0
@@ -614,11 +614,11 @@ _0808A154:
ldrh r1, [r4]
adds r0, r7, #0
movs r2, #2
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r4]
adds r0, r7, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, [r5, #0x6c]
adds r2, r0, #0
adds r2, #0x10
@@ -732,7 +732,7 @@ sub_0808A220: @ 0x0808A220
ldr r0, _0808A2E8 @ =0x00004017
ldrh r1, [r2]
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
movs r7, #1
strb r7, [r4, #0xd]
adds r0, r4, #0
@@ -881,7 +881,7 @@ _0808A316:
orrs r1, r0
adds r0, r3, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
b _0808A3EC
.align 2, 0
_0808A38C: .4byte gLinkEntity
@@ -926,7 +926,7 @@ _0808A39C:
lsls r2, r2, #6
orrs r1, r2
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_0808A3EC:
pop {r4, r5, r6, r7, pc}
.align 2, 0
asm/bigBarrel.s
+6 -6
View File
@@ -67,7 +67,7 @@ _08088AA4:
subs r1, r1, r2
movs r2, #0x80
movs r3, #0x60
bl sub_0800293E
bl CheckPlayerInRegion
cmp r0, #0
beq _08088B82
ldr r0, _08088AE0 @ =gRoomVars
@@ -546,7 +546,7 @@ _08088E50:
ands r1, r2
str r1, [r0, #0x68]
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_08088E6E:
pop {r4, pc}
.align 2, 0
@@ -581,7 +581,7 @@ _08088E94:
orrs r1, r2
str r1, [r0, #0x68]
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _08088F14
.align 2, 0
_08088EB0: .4byte gRoomVars
@@ -672,7 +672,7 @@ _08088F3E:
b _0808908E
_08088F5A:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _0808908E
_08088F62:
ldrb r0, [r4, #0xb]
@@ -737,7 +737,7 @@ _08088FBC:
orrs r1, r0
movs r0, #0x76
movs r2, #2
bl sub_0807B314
bl SetTileType
b _0808908E
.align 2, 0
_08088FE8: .4byte gRoomControls
@@ -820,7 +820,7 @@ _0808905C:
bl PlaySFX
_08089088:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_0808908E:
pop {r4, r5, pc}
.align 2, 0
asm/bigIceBlock.s
+25 -25
View File
@@ -309,20 +309,20 @@ _08099972:
adds r4, #0x38
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
subs r1, #0x40
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
subs r1, r6, #1
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldrb r2, [r4]
adds r0, r5, #0
adds r1, r6, #0
bl UpdateCollisionLayer
bl SetTile
b _08099BF0
.align 2, 0
_080999A4: .4byte 0x00004022
@@ -342,13 +342,13 @@ _080999C0:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r7, _08099A44 @ =0x00004022
adds r1, r6, #0
subs r1, #0x40
ldrb r2, [r4]
adds r0, r7, #0
bl UpdateCollisionLayer
bl SetTile
adds r5, r6, #0
subs r5, #0x3f
lsls r0, r5, #0x10
@@ -363,7 +363,7 @@ _080999EE:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
subs r5, r6, #1
lsls r0, r5, #0x10
lsrs r0, r0, #0x10
@@ -377,11 +377,11 @@ _08099A0C:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldrb r2, [r4]
adds r0, r7, #0
adds r1, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r5, r6, #1
adds r0, r5, #0
ldrb r1, [r4]
@@ -394,7 +394,7 @@ _08099A32:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
b _08099BF0
.align 2, 0
_08099A40: .4byte 0x00004024
@@ -417,7 +417,7 @@ _08099A66:
ldrb r2, [r5]
adds r0, r1, #0
adds r1, r7, #0
bl UpdateCollisionLayer
bl SetTile
adds r4, r6, #0
subs r4, #0x40
lsls r0, r4, #0x10
@@ -432,16 +432,16 @@ _08099A86:
ldrb r2, [r5]
adds r0, r1, #0
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldr r4, _08099AE8 @ =0x00004022
subs r1, r6, #1
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrb r2, [r5]
adds r0, r4, #0
adds r1, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r4, r6, #0
adds r4, #0x3f
adds r0, r4, #0
@@ -455,7 +455,7 @@ _08099ABA:
ldrb r2, [r5]
adds r0, r1, #0
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
adds r4, r6, #0
adds r4, #0x40
adds r0, r4, #0
@@ -469,7 +469,7 @@ _08099AD8:
ldrb r2, [r5]
adds r0, r1, #0
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
b _08099BF0
.align 2, 0
_08099AE4: .4byte 0x00004023
@@ -491,7 +491,7 @@ _08099B08:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r5, r6, #0
subs r5, #0x40
lsls r0, r5, #0x10
@@ -506,7 +506,7 @@ _08099B28:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r5, r6, #0
subs r5, #0x3f
lsls r0, r5, #0x10
@@ -521,7 +521,7 @@ _08099B48:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
subs r5, r6, #1
lsls r0, r5, #0x10
lsrs r0, r0, #0x10
@@ -535,11 +535,11 @@ _08099B66:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08099C04 @ =0x00004022
ldrb r2, [r4]
adds r1, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r5, r6, #1
adds r0, r5, #0
ldrb r1, [r4]
@@ -552,7 +552,7 @@ _08099B8C:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r5, r6, #0
adds r5, #0x3f
adds r0, r5, #0
@@ -566,7 +566,7 @@ _08099BAA:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r5, r6, #0
adds r5, #0x40
adds r0, r5, #0
@@ -580,7 +580,7 @@ _08099BC8:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r5, r6, #0
adds r5, #0x41
adds r0, r5, #0
@@ -594,7 +594,7 @@ _08099BE6:
ldrb r2, [r4]
adds r0, r1, #0
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
_08099BF0:
pop {r4, r5, r6, r7, pc}
.align 2, 0
asm/bigPushableLever.s
+7 -7
View File
@@ -55,7 +55,7 @@ sub_08098F14: @ 0x08098F14
adds r4, r5, #0
adds r4, #0x38
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
adds r0, r5, #0
adds r0, #0x76
ldrh r0, [r0]
@@ -63,7 +63,7 @@ sub_08098F14: @ 0x08098F14
adds r1, #0x72
ldrh r1, [r1]
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
movs r0, #0x99
lsls r0, r0, #1
bl sub_08004488
@@ -189,11 +189,11 @@ sub_08098FE0: @ 0x08098FE0
ldr r0, _08099064 @ =0x00004057
ldrh r1, [r5]
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08099068 @ =0x00004058
ldrh r1, [r7]
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
movs r1, #1
bl UpdateSprite
@@ -246,11 +246,11 @@ _0809906C:
ldr r0, _080990E4 @ =0x00004055
ldrh r1, [r5]
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _080990E8 @ =0x00004056
ldrh r1, [r7]
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
movs r1, #0
bl UpdateSprite
@@ -297,7 +297,7 @@ _08099120:
ldrh r0, [r0]
ldrh r1, [r6]
ldrb r2, [r5]
bl UpdateCollisionLayer
bl SetTile
b _08099154
.align 2, 0
_0809913C: .4byte gUnk_081236E8
asm/blockPushed.s
+2 -2
View File
@@ -101,7 +101,7 @@ _08082EF6:
adds r0, #0x38
ldrb r1, [r0]
adds r0, r5, #0
bl sub_080002B0
bl GetTileType
str r0, [r4, #0x68]
ldrb r0, [r4, #0xa]
cmp r0, #1
@@ -487,7 +487,7 @@ _080831EC:
bl sub_0807B7D8
_080832BA:
mov r0, sb
bl sub_0805E7BC
bl DeleteEntity
_080832C0:
pop {r3, r4}
mov r8, r3
asm/bollard.s
+2 -2
View File
@@ -74,7 +74,7 @@ _0808B2F4:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0808B320 @ =0x000001A5
bl sub_08004488
_0808B31C:
@@ -203,7 +203,7 @@ sub_0808B3AC: @ 0x0808B3AC
ldr r0, _0808B418 @ =0x0000400B
ldrh r1, [r4]
ldrb r2, [r5]
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_0808B414: .4byte gRoomControls
asm/bombPeahat.s
+5 -5
View File
@@ -759,7 +759,7 @@ sub_0802AD54: @ 0x0802AD54
ands r0, r1
strb r0, [r2, #0x18]
adds r0, r2, #0
bl sub_0805E7BC
bl DeleteEntity
b _0802ADD8
.align 2, 0
_0802AD7C: .4byte gRoomControls
@@ -1055,7 +1055,7 @@ _0802AF8A:
thumb_func_start sub_0802AF94
sub_0802AF94: @ 0x0802AF94
push {lr}
bl sub_0805E7BC
bl DeleteEntity
pop {pc}
thumb_func_start sub_0802AF9C
@@ -1079,7 +1079,7 @@ sub_0802AF9C: @ 0x0802AF9C
strb r0, [r1]
_0802AFC0:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_0802AFC6:
pop {r4, pc}
@@ -1325,7 +1325,7 @@ _0802B188: .4byte gLinkState
_0802B18C: .4byte gUnk_080CD17C
_0802B190:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _0802B19E
_0802B198:
adds r0, r4, #0
@@ -1417,7 +1417,7 @@ _0802B232:
sub_0802B234: @ 0x0802B234
push {r4, lr}
movs r4, #0
bl sub_080002A0
bl GetTileTypeByEntity
ldr r1, _0802B24C @ =0xFFFFFE3C
adds r0, r0, r1
cmp r0, #1
asm/bossDoor.s
+12 -12
View File
@@ -454,16 +454,16 @@ _0808C510:
subs r1, #1
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
adds r1, #1
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
b _0808C5CA
.align 2, 0
_0808C56C: .4byte 0x00004022
@@ -497,16 +497,16 @@ _0808C570:
subs r1, #0x40
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
adds r1, #0x40
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
_0808C5CA:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -533,20 +533,20 @@ _0808C5E0:
adds r4, r6, #0
adds r4, #0x38
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
adds r0, #0x7a
ldrh r0, [r0]
ldrh r1, [r5]
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
adds r0, #0x7c
ldrh r0, [r0]
ldrh r1, [r5]
adds r1, #1
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
b _0808C64E
_0808C618:
adds r0, r6, #0
@@ -559,20 +559,20 @@ _0808C618:
adds r4, r6, #0
adds r4, #0x38
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
adds r0, #0x7a
ldrh r0, [r0]
ldrh r1, [r5]
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
adds r0, #0x7c
ldrh r0, [r0]
ldrh r1, [r5]
adds r1, #0x40
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
_0808C64E:
pop {r4, r5, r6, pc}
asm/businessScrub.s
+3 -3
View File
@@ -963,7 +963,7 @@ sub_08028FFC: @ 0x08028FFC
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
pop {r4, pc}
.align 2, 0
_08029074: .4byte 0x00004022
@@ -993,7 +993,7 @@ sub_08029078: @ 0x08029078
cmp r0, #0
bne _080290AE
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080290DE
_080290AE:
adds r0, r4, #0
@@ -1015,7 +1015,7 @@ _080290AE:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_080290DE:
pop {r4, pc}
asm/button.s
+14 -14
View File
@@ -69,7 +69,7 @@ _08081B0E:
adds r6, r4, #0
adds r6, #0x38
ldrb r1, [r6]
bl sub_080002B0
bl GetTileType
adds r1, r4, #0
adds r1, #0x72
strh r0, [r1]
@@ -87,7 +87,7 @@ _08081B0E:
ldrh r1, [r5]
ldrb r2, [r6]
movs r0, #0x7a
bl sub_0807B314
bl SetTileType
b _08081B82
.align 2, 0
_08081B6C: .4byte gRoomControls
@@ -120,7 +120,7 @@ sub_08081B84: @ 0x08081B84
adds r1, r4, #0
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002B0
bl GetTileType
adds r1, r4, #0
adds r1, #0x72
strh r0, [r1]
@@ -221,7 +221,7 @@ sub_08081C30: @ 0x08081C30
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_08081C5A:
adds r0, r4, #0
bl sub_08081CB0
@@ -246,7 +246,7 @@ _08081C70:
subs r0, #0x3c
ldrb r2, [r0]
movs r0, #0x77
bl sub_0807B314
bl SetTileType
movs r0, #0x86
lsls r0, r0, #1
bl PlaySFX
@@ -283,7 +283,7 @@ sub_08081CB0: @ 0x08081CB0
ldrh r0, [r5]
adds r4, #0x38
ldrb r1, [r4]
bl sub_080002B0
bl GetTileType
ldr r1, _08081CE8 @ =0x00004035
cmp r0, r1
bne _08081D1C
@@ -302,7 +302,7 @@ _08081CEC:
adds r5, r4, #0
adds r5, #0x38
ldrb r1, [r5]
bl sub_080002B0
bl GetTileType
lsls r0, r0, #0x10
lsrs r1, r0, #0x10
cmp r1, #0x77
@@ -482,7 +482,7 @@ sub_08081E3C: @ 0x08081E3C
adds r0, #0x38
ldrb r1, [r0]
adds r0, r2, #0
bl sub_080002B0
bl GetTileType
adds r2, r0, #0
ldr r1, _08081E64 @ =gUnk_0811EE50
_08081E52:
@@ -512,13 +512,13 @@ sub_08081E6C: @ 0x08081E6C
ldrb r5, [r0]
adds r0, r6, #0
adds r1, r5, #0
bl sub_080002B0
bl GetTileType
adds r7, r0, #0
ldr r0, _08081EEC @ =0x00003FFF
cmp r7, r0
bls _08081EE8
adds r0, r5, #0
bl sub_0808094C
bl GetLayerByIndex
adds r1, r0, #0
ldrb r0, [r4, #0xa]
movs r4, #0x78
@@ -558,11 +558,11 @@ _08081EB4:
adds r0, r4, #0
adds r1, r6, #0
adds r2, r5, #0
bl sub_0807B314
bl SetTileType
adds r0, r7, #0
adds r1, r6, #0
adds r2, r5, #0
bl UpdateCollisionLayer
bl SetTile
_08081EE8:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -680,7 +680,7 @@ _08081FA4:
adds r5, #0x38
ldrb r2, [r5]
adds r0, r7, #0
bl sub_0807B314
bl SetTileType
adds r0, r4, #0
bl sub_08081F24
movs r0, #0x86
@@ -695,7 +695,7 @@ _08081FA4:
adds r0, r1, #0
ldrh r1, [r6]
ldrb r2, [r5]
bl UpdateCollisionLayer
bl SetTile
_08081FEC:
movs r0, #0
b _08081FF6
asm/castorWildsStatue.s
+8 -8
View File
@@ -133,21 +133,21 @@ sub_08067418: @ 0x08067418
adds r4, #0x38
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r7]
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r7]
adds r1, #0x3f
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r7]
adds r1, #0x40
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
b _080674F8
.align 2, 0
_08067488: .4byte gRoomControls
@@ -186,19 +186,19 @@ _08067494:
ldr r1, _08067504 @ =0x00000E81
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _08067508 @ =0x00000E82
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0806750C @ =0x00000E83
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _08067510 @ =0x00000EC3
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_080674F8:
adds r0, r6, #0
bl sub_0807DD50
asm/chestSpawner.s
+3 -3
View File
@@ -525,7 +525,7 @@ sub_08084190: @ 0x08084190
ldr r0, _08084208 @ =gUnk_0811F8A8
str r0, [r4, #0x48]
adds r0, r4, #0
bl sub_080002A0
bl GetTileTypeByEntity
cmp r0, #0x74
bne _080841D2
bl sub_0805E780
@@ -627,11 +627,11 @@ sub_0808427C: @ 0x0808427C
bne _080842D4
_0808428A:
adds r0, r4, #0
bl sub_080002A0
bl GetTileTypeByEntity
cmp r0, #0x74
bne _0808429C
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080842D4
_0808429C:
adds r0, r4, #0
asm/chuchuBoss.s
+1 -1
View File
@@ -862,7 +862,7 @@ _080262EC:
movs r1, #0xb2
lsls r1, r1, #2
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_0802631A:
pop {r4, r5, r6, pc}
.align 2, 0
asm/clothesRack.s
+6 -6
View File
@@ -76,7 +76,7 @@ _0806DDC4:
mov r0, sb
ldrb r2, [r0]
mov r0, sl
bl UpdateCollisionLayer
bl SetTile
mov r2, r8
ldrh r1, [r2, #6]
adds r1, #0x18
@@ -92,7 +92,7 @@ _0806DDC4:
mov r0, sb
ldrb r2, [r0]
mov r0, sl
bl UpdateCollisionLayer
bl SetTile
mov r2, r8
ldrh r1, [r2, #6]
adds r1, #0x18
@@ -109,7 +109,7 @@ _0806DDC4:
mov r0, sb
ldrb r2, [r0]
mov r0, sl
bl UpdateCollisionLayer
bl SetTile
mov r2, r8
ldrh r1, [r2, #6]
subs r1, #0x18
@@ -126,7 +126,7 @@ _0806DDC4:
mov r0, sb
ldrb r2, [r0]
mov r0, sl
bl UpdateCollisionLayer
bl SetTile
mov r2, r8
ldrh r1, [r2, #6]
subs r1, #0x18
@@ -142,7 +142,7 @@ _0806DDC4:
mov r0, sb
ldrb r2, [r0]
mov r0, sl
bl UpdateCollisionLayer
bl SetTile
mov r1, r8
ldrh r0, [r1, #6]
subs r0, #0x18
@@ -160,7 +160,7 @@ _0806DDC4:
ldrb r2, [r0]
mov r0, sl
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
asm/code_08000108.s
+10 -10
View File
@@ -54,8 +54,8 @@ sub_08000152: @ 0x08000152
ldrh r0, [r3, r0]
lsrs r2, r2, #2
non_word_aligned_thumb_func_start UpdateCollisionLayer
UpdateCollisionLayer: @ 0x0800015E
non_word_aligned_thumb_func_start SetTile
SetTile: @ 0x0800015E
push {r4, r5, r6, r7, lr}
lsls r3, r2, #3
ldr r4, _08000208 @ =gUnk_08000228
@@ -77,7 +77,7 @@ UpdateCollisionLayer: @ 0x0800015E
bl sub_08000148
pop {r0, r1}
push {r0, r1}
bl sub_0801AF8C
bl DeleteLoadedTileEntity
adds r0, r7, #0
pop {r1, r2}
bl sub_0801AF48
@@ -96,7 +96,7 @@ _0800019A:
lsrs r2, r2, #2
bl sub_08000148
pop {r0, r1}
bl sub_0801AF8C
bl DeleteLoadedTileEntity
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080001C0: .4byte gUnk_0202BEB4
@@ -197,13 +197,13 @@ sub_0800029C: @ 0x0800029C
ldr r3, _08000308 @ =gUnk_03005780
bx r3
thumb_func_start sub_080002A0
sub_080002A0: @ 0x080002A0
thumb_func_start GetTileTypeByEntity
GetTileTypeByEntity: @ 0x080002A0
ldr r3, _0800030C @ =gUnk_0300579C
bx r3
thumb_func_start sub_080002A4
sub_080002A4: @ 0x080002A4
thumb_func_start GetTileTypeByPos
GetTileTypeByPos: @ 0x080002A4
ldr r3, _08000310 @ =gUnk_030057A8
bx r3
@@ -217,8 +217,8 @@ sub_080002AC: @ 0x080002AC
ldr r3, _08000318 @ =gUnk_030057CC
bx r3
thumb_func_start sub_080002B0
sub_080002B0: @ 0x080002B0
thumb_func_start GetTileType
GetTileType: @ 0x080002B0
ldr r3, _0800031C @ =gUnk_030057D4
bx r3
asm/code_080011C4.s
+4 -4
View File
@@ -1372,8 +1372,8 @@ _08002902:
subs r0, r1, #1
pop {r4, pc}
non_word_aligned_thumb_func_start sub_0800290E
sub_0800290E: @ 0x0800290E
non_word_aligned_thumb_func_start CheckRectOnScreen
CheckRectOnScreen: @ 0x0800290E
push {r4, r5, r6, lr}
ldr r4, _080029A8 @ =gRoomControls
ldrh r5, [r4, #0xa]
@@ -1400,8 +1400,8 @@ _0800293A:
movs r0, #0
pop {r4, r5, r6, pc}
non_word_aligned_thumb_func_start sub_0800293E
sub_0800293E: @ 0x0800293E
non_word_aligned_thumb_func_start CheckPlayerInRegion
CheckPlayerInRegion: @ 0x0800293E
push {r4, r5, r6, r7, lr}
ldr r4, _080029AC @ =gRoomControls
ldr r7, _080029B0 @ =gLinkEntity
asm/code_08003FC4.s
+1 -1
View File
@@ -625,5 +625,5 @@ _080043B6:
strb r1, [r0, #0xb]
_080043E0:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
pop {r4, pc}
asm/code_080041E8.s
+1 -1
View File
@@ -291,5 +291,5 @@ _080043B6:
strb r1, [r0, #0xb]
_080043E0:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
pop {r4, pc}
asm/code_0800857C.s
+11 -11
View File
@@ -318,7 +318,7 @@ sub_08008796: @ 0x08008796
adds r1, r7, #0
movs r2, #0x38
ldrb r2, [r4, r2]
bl sub_080002A4
bl GetTileTypeByPos
ldr r1, _080088D8 @ =gUnk_080046A4
bl sub_08007DE0
beq _080087CE
@@ -409,7 +409,7 @@ _0800883A:
beq _08008876
push {r0, r1}
adds r0, r2, #0
bl sub_0808094C
bl GetLayerByIndex
adds r3, r0, #4
pop {r0, r1}
lsls r1, r1, #1
@@ -3994,26 +3994,26 @@ gUnk_08016984:: @ 08016984
.text
non_word_aligned_thumb_func_start sub_08016986
sub_08016986: @ 0x08016986
non_word_aligned_thumb_func_start GetNextScriptCommandHalfword
GetNextScriptCommandHalfword: @ 0x08016986
ldrh r0, [r0]
bx lr
non_word_aligned_thumb_func_start sub_0801698A
sub_0801698A: @ 0x0801698A
non_word_aligned_thumb_func_start GetNextScriptCommandHalfwordAfterCommandMetadata
GetNextScriptCommandHalfwordAfterCommandMetadata: @ 0x0801698A
ldrh r0, [r0, #2]
bx lr
non_word_aligned_thumb_func_start sub_0801698E
sub_0801698E: @ 0x0801698E
non_word_aligned_thumb_func_start GetNextScriptCommandWord
GetNextScriptCommandWord: @ 0x0801698E
ldrh r1, [r0]
ldrh r0, [r0, #2]
lsls r0, r0, #0x10
orrs r0, r1
bx lr
thumb_func_start sub_08016998
sub_08016998: @ 0x08016998
thumb_func_start GetNextScriptCommandWordAfterCommandMetadata
GetNextScriptCommandWordAfterCommandMetadata: @ 0x08016998
ldrh r1, [r0, #2]
ldrh r0, [r0, #4]
lsls r0, r0, #0x10
@@ -4064,7 +4064,7 @@ sub_08016A30: @ 0x08016A30
ldrh r0, [r4, #0x2e]
ldrh r1, [r4, #0x32]
movs r2, #2
bl sub_080002A4
bl GetTileTypeByPos
movs r3, #1
cmp r0, #0
beq _08016A62
asm/code_08018500.s
+15 -15
View File
@@ -593,12 +593,12 @@ _0801897C:
subs r1, r4, #1
movs r0, #0x8c
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r0, #0x8e
adds r1, r4, #0
_0801899C:
movs r2, #1
bl sub_0807B314
bl SetTileType
b _080189E4
_080189A4:
cmp r4, #0
@@ -660,7 +660,7 @@ _08018A0E:
adds r0, r5, r1
adds r1, r6, r5
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r5, #1
cmp r5, #3
bls _08018A0E
@@ -672,12 +672,12 @@ _08018A24:
adds r4, r6, r5
adds r1, r4, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
ldr r1, _08018A54 @ =0x000001DB
adds r0, r5, r1
adds r1, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
adds r5, #1
cmp r5, #3
bls _08018A24
@@ -721,7 +721,7 @@ _08018A8A:
adds r6, #1
adds r1, r5, r4
movs r2, #1
bl sub_0807B314
bl SetTileType
adds r4, #1
cmp r4, #6
bls _08018A8A
@@ -764,12 +764,12 @@ _08018ADA:
adds r1, r5, r6
movs r2, #1
str r3, [sp]
bl sub_0807B314
bl SetTileType
adds r0, r7, #0
adds r7, #1
adds r1, r4, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r4, #1
adds r6, #1
ldr r3, [sp]
@@ -805,12 +805,12 @@ _08018B28:
add r8, r1
adds r1, r6, r5
movs r2, #1
bl sub_0807B314
bl SetTileType
adds r0, r7, #0
adds r7, #1
adds r1, r4, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r4, #1
adds r5, #1
cmp r5, #3
@@ -858,7 +858,7 @@ _08018B8A:
adds r1, r5, r4
movs r2, #1
str r3, [sp]
bl sub_0807B314
bl SetTileType
adds r4, #1
ldr r3, [sp]
cmp r4, #4
@@ -917,7 +917,7 @@ sub_08018BB4: @ 0x08018BB4
_08018C08:
movs r0, #0x73
adds r1, r3, #0
bl sub_0807B314
bl SetTileType
_08018C10:
add sp, #8
pop {r4, r5, pc}
@@ -944,7 +944,7 @@ _08018C32:
adds r6, #1
adds r1, r5, r4
movs r2, #1
bl sub_0807B314
bl SetTileType
adds r4, #1
cmp r4, #4
bls _08018C32
@@ -969,12 +969,12 @@ _08018C5E:
adds r0, r5, r1
adds r1, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _08018C84 @ =0x00000261
adds r0, r5, r1
adds r1, r4, #1
movs r2, #1
bl sub_0807B314
bl SetTileType
adds r5, #2
adds r4, #0x40
cmp r5, #5
asm/code_08019444.s
+30 -30
View File
@@ -676,7 +676,7 @@ _0801997C:
adds r5, r4, #0
adds r5, #0x38
ldrb r0, [r5]
bl sub_0808094C
bl GetLayerByIndex
mov r8, r0
ldrb r1, [r4, #0x14]
movs r0, #6
@@ -708,7 +708,7 @@ _0801997C:
orrs r7, r0
ldrb r1, [r5]
adds r0, r7, #0
bl sub_080002B0
bl GetTileType
adds r6, r0, #0
ldr r0, _080199E8 @ =0x00003FFF
cmp r6, r0
@@ -1814,7 +1814,7 @@ _0801A1D4:
adds r1, #0x38
ldrb r2, [r1]
adds r1, r7, #0
bl UpdateCollisionLayer
bl SetTile
movs r0, #0xa0
strb r0, [r6, #6]
movs r0, #5
@@ -1859,7 +1859,7 @@ _0801A23C:
adds r4, #0x38
ldrb r2, [r4]
adds r1, r7, #0
bl UpdateCollisionLayer
bl SetTile
ldrb r2, [r4]
movs r0, #0xd
adds r1, r7, #0
@@ -1876,7 +1876,7 @@ _0801A28C:
adds r1, #0x38
ldrb r2, [r1]
adds r1, r7, #0
bl UpdateCollisionLayer
bl SetTile
movs r0, #4
b _0801A2A6
.align 2, 0
@@ -1928,7 +1928,7 @@ sub_0801A2B0: @ 0x0801A2B0
adds r0, #0x38
ldrb r1, [r0]
adds r0, r4, #0
bl sub_080002B0
bl GetTileType
bl sub_080002E4
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
@@ -2004,7 +2004,7 @@ sub_0801A370: @ 0x0801A370
cmp r0, #0
beq _0801A44E
movs r0, #2
bl sub_0808094C
bl GetLayerByIndex
adds r7, r0, #0
ldr r1, _0801A3CC @ =gUnk_080B4488
ldrb r0, [r5, #0x14]
@@ -2018,7 +2018,7 @@ sub_0801A370: @ 0x0801A370
adds r0, #0x38
ldrb r1, [r0]
adds r0, r4, #0
bl sub_080002B0
bl GetTileType
adds r1, r0, #0
ldr r0, _0801A3D0 @ =0x0000402B
cmp r1, r0
@@ -2048,7 +2048,7 @@ _0801A3D6:
adds r0, #0x38
ldrb r1, [r0]
adds r0, r4, #0
bl sub_080002B0
bl GetTileType
bl sub_080002E4
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
@@ -2132,7 +2132,7 @@ sub_0801A458: @ 0x0801A458
adds r0, #0x38
ldrb r1, [r0]
adds r0, r4, #0
bl sub_080002B0
bl GetTileType
bl sub_080002E4
cmp r0, #0x52
beq _0801A4F0
@@ -2272,7 +2272,7 @@ _0801A58C:
adds r4, r6, #0
adds r4, #0x38
ldrb r0, [r4]
bl sub_0808094C
bl GetLayerByIndex
mov r8, r0
ldr r0, _0801A668 @ =0x00005004
add r0, r8
@@ -2356,7 +2356,7 @@ _0801A628:
mov r0, sb
ldrb r1, [r0]
adds r0, r4, #0
bl sub_080002B0
bl GetTileType
adds r5, r0, #0
ldr r1, _0801A670 @ =0xFFFFFC97
adds r0, r5, r1
@@ -2457,7 +2457,7 @@ _0801A6E6:
mov r0, sb
ldrb r1, [r0]
adds r0, r4, #0
bl sub_080002B0
bl GetTileType
adds r5, r0, #0
ldr r0, _0801A734 @ =0x00000369
cmp r5, r0
@@ -2559,7 +2559,7 @@ _0801A7A6:
mov r0, sb
ldrb r1, [r0]
adds r0, r4, #0
bl sub_080002B0
bl GetTileType
adds r5, r0, #0
ldr r0, _0801A7F4 @ =0x00000369
cmp r5, r0
@@ -2655,7 +2655,7 @@ _0801A85E:
mov r0, sb
ldrb r1, [r0]
adds r0, r4, #0
bl sub_080002B0
bl GetTileType
adds r5, r0, #0
ldr r0, _0801A89C @ =0x00000369
cmp r5, r0
@@ -2718,7 +2718,7 @@ sub_0801A8D0: @ 0x0801A8D0
adds r0, r5, #0
adds r0, #0x38
ldrb r0, [r0]
bl sub_0808094C
bl GetLayerByIndex
adds r6, r0, #4
cmp r4, #0
bne _0801A92C
@@ -2808,7 +2808,7 @@ sub_0801A980: @ 0x0801A980
adds r6, r4, #0
adds r6, #0x38
ldrb r0, [r6]
bl sub_0808094C
bl GetLayerByIndex
ldrb r0, [r4, #0x14]
movs r2, #6
ands r2, r0
@@ -2838,7 +2838,7 @@ sub_0801A980: @ 0x0801A980
lsls r1, r1, #6
orrs r0, r1
ldrb r1, [r6]
bl sub_080002B0
bl GetTileType
lsls r0, r0, #0x10
lsrs r1, r0, #0x10
ldr r0, _0801A9EC @ =0x00003FFF
@@ -2923,7 +2923,7 @@ sub_0801AA58: @ 0x0801AA58
adds r0, r0, r6
mov r8, r0
ldrb r0, [r0]
bl sub_0808094C
bl GetLayerByIndex
ldr r2, _0801AAF0 @ =gUnk_080B4488
lsrs r1, r7, #3
lsls r1, r1, #1
@@ -3259,7 +3259,7 @@ _0801ACDA:
adds r4, r0, #0
adds r0, r6, #0
movs r1, #1
bl sub_080002B0
bl GetTileType
cmp r4, r0
bne _0801ACD8
ldrh r0, [r5, #0xa]
@@ -3289,7 +3289,7 @@ _0801AD1A:
adds r4, r0, #0
adds r0, r6, #0
movs r1, #2
bl sub_080002B0
bl GetTileType
cmp r4, r0
bne _0801AD18
ldrh r0, [r5, #0xa]
@@ -3549,7 +3549,7 @@ _0801AF2E:
ldrsh r1, [r4, r2]
adds r1, r6, r1
adds r2, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r4, #4
movs r1, #0
ldrsh r0, [r4, r1]
@@ -3593,8 +3593,8 @@ _0801AF80: .4byte gUnk_030010A0
_0801AF84: .4byte gRoomVars
_0801AF88: .4byte gUnk_0200B240
thumb_func_start sub_0801AF8C
sub_0801AF8C: @ 0x0801AF8C
thumb_func_start DeleteLoadedTileEntity
DeleteLoadedTileEntity: @ 0x0801AF8C
push {r4, r5, r6, lr}
adds r4, r0, #0
lsls r1, r1, #0xc
@@ -3686,7 +3686,7 @@ _0801B026:
lsls r1, r7, #6
adds r1, r1, r2
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_0801B03E:
adds r3, r4, #0
adds r2, r5, #0
@@ -5183,7 +5183,7 @@ sub_0801BB2C: @ 0x0801BB2C
subs r4, #0x1c
ldrb r0, [r5, #0xb]
adds r1, r4, #0
bl sub_08054464
bl SetBottleContents
ldrb r0, [r5, #0xb]
adds r1, r4, #0
movs r2, #5
@@ -5328,7 +5328,7 @@ _0801BC98:
ldrb r1, [r0]
subs r1, #0x1c
adds r0, r6, #0
bl sub_08054464
bl SetBottleContents
pop {r4, r5, r6, pc}
.align 2, 0
_0801BCB0: .4byte gUnk_02002A40
@@ -5352,7 +5352,7 @@ sub_0801BCB4: @ 0x0801BCB4
ldrb r1, [r0]
subs r1, #0x1c
movs r0, #0x20
bl sub_08054464
bl SetBottleContents
_0801BCDA:
ldrb r0, [r5]
subs r0, #0x26
@@ -5668,7 +5668,7 @@ sub_0801BEF8: @ 0x0801BEF8
mov r1, r8
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002B0
bl GetTileType
mov r1, r8
adds r1, #0x6c
strh r0, [r1]
@@ -5732,7 +5732,7 @@ _0801BF62:
mov r1, r8
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002B0
bl GetTileType
mov r1, r8
adds r1, #0x6c
strh r0, [r1]
asm/code_08049CD4.s
+2 -2
View File
@@ -585,7 +585,7 @@ _0804A0DE:
beq _0804A15A
mov r1, sl
ldrb r0, [r1]
bl sub_0808094C
bl GetLayerByIndex
mov sb, r0
cmp r6, #0
bge _0804A0FA
@@ -1643,7 +1643,7 @@ _0804A8CA:
orrs r1, r2
strb r1, [r0]
adds r0, r5, #0
bl sub_0805E7BC
bl DeleteEntity
b _0804A982
.align 2, 0
_0804A8E8: .4byte gUnk_02002A40
asm/code_0804AEB0.s
+1 -1
View File
@@ -119,7 +119,7 @@ _0804AF64:
cmp r0, #0
bne _0804AF88
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_0804AF88:
pop {r4, pc}
.align 2, 0
asm/code_0804B058.s
+3 -3
View File
@@ -185,7 +185,7 @@ _0804B170:
_0804B190:
movs r0, #0x74
adds r1, r3, #0
bl sub_0807B314
bl SetTileType
_0804B198:
adds r4, #8
ldr r0, _0804B1A8 @ =gUnk_020176A0
@@ -413,7 +413,7 @@ sub_0804B340: @ 0x0804B340
ldrh r0, [r4, #6]
ldrh r1, [r4, #4]
ldrb r2, [r4, #1]
bl sub_0807B314
bl SetTileType
b _0804B380
_0804B35A:
ldr r1, _0804B384 @ =gRoomVars
@@ -450,7 +450,7 @@ sub_0804B388: @ 0x0804B388
_0804B396:
adds r1, r5, #0
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
movs r0, #0xf
movs r1, #2
movs r2, #0
asm/code_0804B9F8.s
+107 -107
View File
@@ -535,23 +535,23 @@ sub_0804BD50: @ 0x0804BD50
ldr r1, _0804BD9C @ =0x0000014D
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
movs r1, #0x86
lsls r1, r1, #1
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r4, #0x1e
movs r1, #0xa6
lsls r1, r1, #1
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
movs r1, #0xc6
lsls r1, r1, #1
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0804BDA0 @ =gUnk_080D7D34
bl LoadRoomEntityList
_0804BD94:
@@ -633,11 +633,11 @@ _0804BDE8:
movs r0, #0x76
movs r1, #0x82
movs r2, #2
bl sub_0807B314
bl SetTileType
movs r0, #0x76
movs r1, #0x8c
movs r2, #2
bl sub_0807B314
bl SetTileType
_0804BE00:
pop {pc}
.align 2, 0
@@ -995,20 +995,20 @@ _0804C054:
lsls r0, r0, #1
ldr r1, _0804C0D8 @ =0x0000058E
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0804C0DC @ =0x0000017B
ldr r1, _0804C0E0 @ =0x0000058F
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r0, #0xbe
lsls r0, r0, #1
ldr r1, _0804C0E4 @ =0x000005CE
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0804C0E8 @ =0x0000017D
ldr r1, _0804C0EC @ =0x000005CF
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804C090:
bl sub_08054570
bl sub_08059278
@@ -1016,11 +1016,11 @@ _0804C090:
ldr r1, _0804C0F4 @ =0x00000A47
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804C0F8 @ =0x00000C47
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
movs r0, #0x62
bl GetProgressFlag
cmp r0, #0
@@ -1199,7 +1199,7 @@ _0804C206:
ldr r1, _0804C244 @ =0x00000107
movs r0, #0x73
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804C228:
ldr r0, _0804C248 @ =gUnk_080D9328
bl sub_0804B1AC
@@ -1268,7 +1268,7 @@ sub_0804C290: @ 0x0804C290
ldrh r0, [r1]
ldrh r1, [r1, #2]
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804C2B2:
pop {pc}
.align 2, 0
@@ -2172,7 +2172,7 @@ _0804C806:
ldr r0, _0804C828 @ =0x00004072
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
adds r4, #1
adds r5, #1
cmp r4, #0x12
@@ -2932,7 +2932,7 @@ _0804CC08:
ldr r1, _0804CC28 @ =0x00000285
movs r0, #0x79
movs r2, #1
bl sub_0807B314
bl SetTileType
b _0804CC4A
.align 2, 0
_0804CC24: .4byte gUnk_080DE834
@@ -2941,7 +2941,7 @@ _0804CC2C:
ldr r1, _0804CC4C @ =0x00000285
movs r0, #0x7a
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r0, #0x24
bl sub_0807CBD0
cmp r0, #0
@@ -2949,7 +2949,7 @@ _0804CC2C:
ldr r1, _0804CC50 @ =0x00000205
movs r0, #0x73
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804CC4A:
pop {pc}
.align 2, 0
@@ -3004,11 +3004,11 @@ _0804CC7E:
ldr r1, _0804CC98 @ =0x0000020B
movs r0, #0x90
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804CC9C @ =0x00000411
movs r0, #0x90
movs r2, #1
bl sub_0807B314
bl SetTileType
b _0804CCB4
.align 2, 0
_0804CC94: .4byte gUnk_02002A40
@@ -3018,11 +3018,11 @@ _0804CCA0:
ldr r1, _0804CCE4 @ =0x00000211
movs r0, #0x90
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804CCE8 @ =0x0000040B
movs r0, #0x90
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804CCB4:
movs r0, #0x15
bl sub_0807CBD0
@@ -3032,7 +3032,7 @@ _0804CCB4:
lsls r1, r1, #2
movs r0, #0x76
movs r2, #2
bl sub_0807B314
bl SetTileType
_0804CCCA:
movs r0, #0x16
bl sub_0807CBD0
@@ -3042,7 +3042,7 @@ _0804CCCA:
lsls r1, r1, #2
movs r0, #0x76
movs r2, #2
bl sub_0807B314
bl SetTileType
_0804CCE0:
pop {pc}
.align 2, 0
@@ -4477,7 +4477,7 @@ sub_0804D340: @ 0x0804D340
movs r1, #0x84
lsls r1, r1, #1
movs r2, #1
bl sub_0807B314
bl SetTileType
bl sub_08054570
movs r0, #0xc4
bl sub_0807CBD0
@@ -5328,11 +5328,11 @@ _0804D7A0:
ldr r1, _0804D7DC @ =0x00000145
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804D7E0 @ =0x00000149
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0804D7E4 @ =gUnk_02033A90
ldr r1, _0804D7E8 @ =0x00000864
adds r0, r0, r1
@@ -5359,7 +5359,7 @@ _0804D7F8:
adds r4, #2
ldr r0, _0804D80C @ =0x00004072
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804D804:
ldrh r0, [r4]
cmp r0, #0
@@ -6567,7 +6567,7 @@ sub_0804DED0: @ 0x0804DED0
lsls r0, r0, #1
ldr r1, _0804DEF8 @ =0x0000066B
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0804DEFC @ =gUnk_02002A40
ldrb r0, [r0, #8]
cmp r0, #1
@@ -6853,7 +6853,7 @@ _0804E168:
ldrh r0, [r4, #4]
ldrh r1, [r4, #2]
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_0804E17A:
adds r4, #6
_0804E17C:
@@ -6881,7 +6881,7 @@ _0804E1A0:
ldrh r0, [r4, #4]
ldrh r1, [r4, #2]
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_0804E1B2:
adds r4, #6
_0804E1B4:
@@ -6910,7 +6910,7 @@ _0804E1D8:
ldrh r0, [r4, #4]
ldrh r1, [r4, #2]
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_0804E1EA:
adds r4, #6
_0804E1EC:
@@ -7110,20 +7110,20 @@ _0804E2C0:
lsls r1, r1, #2
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r1, #0xa6
lsls r1, r1, #2
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804E310 @ =0x00000266
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804E314 @ =0x000002A6
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
b _0804E3A6
.align 2, 0
_0804E300: .4byte gUnk_02033A90
@@ -7143,15 +7143,15 @@ _0804E318:
adds r0, r4, #0
movs r1, #0x9e
movs r2, #1
bl sub_0807B314
bl SetTileType
adds r0, r4, #0
movs r1, #0x9f
movs r2, #1
bl sub_0807B314
bl SetTileType
adds r0, r4, #0
movs r1, #0xa0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804E348:
ldr r0, _0804E368 @ =gUnk_080F0850
bl LoadRoomEntityList
@@ -7176,12 +7176,12 @@ _0804E376:
lsls r1, r1, #2
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r1, #0xa6
lsls r1, r1, #2
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r0, #0x10
bl sub_0807CBD0
cmp r0, #0
@@ -7866,21 +7866,21 @@ sub_0804E898: @ 0x0804E898
ldr r1, _0804E8E4 @ =0x00000202
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804E8E8 @ =0x00000242
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r1, #0x81
lsls r1, r1, #2
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r1, #0x91
lsls r1, r1, #2
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804E8D8:
pop {r4, pc}
.align 2, 0
@@ -8059,71 +8059,71 @@ _0804EA14:
lsls r1, r1, #3
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804EAD8 @ =0x00000591
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804EADC @ =0x00000592
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804EAE0 @ =0x00000593
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804EAE4 @ =0x00000594
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
movs r1, #0xba
lsls r1, r1, #3
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
movs r1, #0xc2
lsls r1, r1, #3
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
movs r1, #0xca
lsls r1, r1, #3
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804EAE8 @ =0x000005D4
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804EAEC @ =0x00000614
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804EAF0 @ =0x00000654
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
movs r1, #0xd2
lsls r1, r1, #3
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804EAF4 @ =0x00000691
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804EAF8 @ =0x00000692
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804EAFC @ =0x00000693
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _0804EB00 @ =0x00000694
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
pop {r4, pc}
.align 2, 0
_0804EAC4: .4byte gUnk_080F3C64
@@ -9001,11 +9001,11 @@ _0804F0E6:
ldr r1, _0804F120 @ =0x000004C7
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F124 @ =0x00000507
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804F106:
movs r2, #0xf4
lsls r2, r2, #1
@@ -9395,19 +9395,19 @@ _0804F346:
ldr r1, _0804F39C @ =0x00000311
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F3A0 @ =0x00000351
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F3A4 @ =0x000003D9
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F3A8 @ =0x00000419
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804F38A:
pop {r4, pc}
.align 2, 0
@@ -9473,11 +9473,11 @@ _0804F406:
ldr r0, _0804F450 @ =0x00004072
ldr r1, _0804F454 @ =0x00000D88
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0804F458 @ =0x00004096
ldr r1, _0804F45C @ =0x00000DC8
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_0804F42A:
ldr r0, _0804F460 @ =gUnk_02002A40
ldrb r0, [r0, #8]
@@ -9582,23 +9582,23 @@ sub_0804F4F4: @ 0x0804F4F4
ldr r1, _0804F55C @ =0x000007A2
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F560 @ =0x000007A3
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F564 @ =0x000007A5
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F568 @ =0x000007A6
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F56C @ =0x000007A7
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804F540:
movs r0, #0x15
bl GetProgressFlag
@@ -9637,27 +9637,27 @@ _0804F590:
ldr r1, _0804F5D0 @ =0x0000094A
movs r0, #0x37
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F5D4 @ =0x0000094B
movs r0, #0x37
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F5D8 @ =0x0000094C
movs r0, #0x37
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F5DC @ =0x0000098A
movs r0, #0x37
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F5E0 @ =0x0000098B
movs r0, #0x37
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F5E4 @ =0x0000098C
movs r0, #0x37
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804F5CC:
pop {pc}
.align 2, 0
@@ -9675,44 +9675,44 @@ sub_0804F5E8: @ 0x0804F5E8
ldr r0, _0804F654 @ =0x000001D3
ldr r1, _0804F658 @ =0x00000BDE
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r4, #0xeb
lsls r4, r4, #1
ldr r1, _0804F65C @ =0x00000BE2
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r0, #0xea
lsls r0, r0, #1
ldr r1, _0804F660 @ =0x00000C1F
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0804F664 @ =0x000001D5
movs r1, #0xc2
lsls r1, r1, #4
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F668 @ =0x00000C5E
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r4, _0804F66C @ =0x00004072
ldr r1, _0804F670 @ =0x00000B9B
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F674 @ =0x00000BDB
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F678 @ =0x00000AA4
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F67C @ =0x00000AE4
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
pop {r4, pc}
.align 2, 0
_0804F654: .4byte 0x000001D3
@@ -9935,11 +9935,11 @@ sub_0804F808: @ 0x0804F808
ldr r1, _0804F828 @ =0x0000041D
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F82C @ =0x00000621
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
pop {r4, pc}
.align 2, 0
_0804F824: .4byte 0x000001D3
@@ -9954,12 +9954,12 @@ sub_0804F830: @ 0x0804F830
ldr r1, _0804F850 @ =0x0000041E
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r1, #0xc4
lsls r1, r1, #3
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
pop {r4, pc}
.align 2, 0
_0804F850: .4byte 0x0000041E
@@ -9971,21 +9971,21 @@ sub_0804F854: @ 0x0804F854
ldr r1, _0804F88C @ =0x0000041F
adds r0, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r4, #0xea
lsls r4, r4, #1
ldr r1, _0804F890 @ =0x000004E5
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F894 @ =0x0000061F
adds r0, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F898 @ =0x00000559
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
pop {r4, r5, pc}
.align 2, 0
_0804F888: .4byte 0x000001D5
@@ -10003,20 +10003,20 @@ sub_0804F89C: @ 0x0804F89C
lsls r1, r1, #3
adds r0, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r4, _0804F8D0 @ =0x000001D5
ldr r1, _0804F8D4 @ =0x00000525
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F8D8 @ =0x0000061E
adds r0, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F8DC @ =0x00000519
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
pop {r4, r5, pc}
.align 2, 0
_0804F8D0: .4byte 0x000001D5
@@ -10031,21 +10031,21 @@ sub_0804F8E0: @ 0x0804F8E0
ldr r1, _0804F918 @ =0x00000421
adds r0, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r4, #0xeb
lsls r4, r4, #1
ldr r1, _0804F91C @ =0x00000565
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F920 @ =0x0000061D
adds r0, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r1, _0804F924 @ =0x000004D9
adds r0, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
pop {r4, r5, pc}
.align 2, 0
_0804F914: .4byte 0x000001D3
@@ -10408,7 +10408,7 @@ sub_0804FB30: @ 0x0804FB30
movs r0, #0x73
movs r1, #0xcb
movs r2, #1
bl sub_0807B314
bl SetTileType
_0804FB64:
pop {pc}
.align 2, 0
@@ -11226,7 +11226,7 @@ sub_0804FED8: @ 0x0804FED8
lsls r0, r0, #1
ldr r1, _0804FEE8 @ =0x0000066F
movs r2, #1
bl sub_0807B314
bl SetTileType
pop {pc}
.align 2, 0
_0804FEE8: .4byte 0x0000066F
asm/code_080526F8.s
+10 -10
View File
@@ -2016,7 +2016,7 @@ sub_0805368C: @ 0x0805368C
bl sub_0805EB00
cmp r0, #0
beq _080536A6
bl sub_0805E7BC
bl DeleteEntity
movs r0, #0xf0
bl PlaySFX
_080536A6:
@@ -2866,7 +2866,7 @@ sub_08053D34: @ 0x08053D34
movs r0, #0x74
movs r1, #0xc4
movs r2, #1
bl sub_0807B314
bl SetTileType
_08053D5C:
adds r0, r4, #0
movs r1, #0x3e
@@ -2876,7 +2876,7 @@ _08053D5C:
movs r0, #0x74
movs r1, #0xcc
movs r2, #1
bl sub_0807B314
bl SetTileType
_08053D72:
ldr r0, _08053D8C @ =gUnk_03000FD0
ldrb r0, [r0]
@@ -3177,8 +3177,8 @@ sub_08053FB4: @ 0x08053FB4
_08053FC8: .4byte gUnk_080FD138
_08053FCC: .4byte gUnk_02000080
thumb_func_start sub_08053FD0
sub_08053FD0: @ 0x08053FD0
thumb_func_start GetSaleItemConfirmMessageID
GetSaleItemConfirmMessageID: @ 0x08053FD0
lsls r0, r0, #3
ldr r1, _08053FDC @ =gUnk_080FD964
adds r0, r0, r1
@@ -3197,8 +3197,8 @@ sub_08053FE0: @ 0x08053FE0
.align 2, 0
_08053FEC: .4byte gUnk_080FD964
thumb_func_start sub_08053FF0
sub_08053FF0: @ 0x08053FF0
thumb_func_start GiveItem
GiveItem: @ 0x08053FF0
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
@@ -3225,7 +3225,7 @@ _08054018:
cmp r0, #0
bne _08054034
adds r0, r6, #0
bl sub_08054398
bl PutItemOnSlot
cmp r5, #0
bne _08054034
adds r0, r6, #0
@@ -3313,7 +3313,7 @@ _080540EE:
movs r1, #1
bl sub_0807CAA0
adds r0, r6, #0
bl sub_08054398
bl PutItemOnSlot
b _0805427C
.align 2, 0
_08054100: .4byte gUnk_02002A40
@@ -3414,7 +3414,7 @@ _080541B6:
movs r1, #1
bl sub_0807CAA0
movs r0, #7
bl sub_08054398
bl PutItemOnSlot
b _080541E2
_080541CA:
ldr r0, _080541EC @ =gUnk_02002A40
asm/code_0805436C.s
+12 -12
View File
@@ -33,8 +33,8 @@ _08054392:
pop {pc}
.align 2, 0
thumb_func_start sub_08054398
sub_08054398: @ 0x08054398
thumb_func_start PutItemOnSlot
PutItemOnSlot: @ 0x08054398
push {r4, r5, lr}
adds r5, r0, #0
cmp r5, #0x46
@@ -147,8 +147,8 @@ _08054458: .4byte gUnk_02002A40
_0805445C: .4byte gUnk_080FD5B4
_08054460: .4byte gUnk_0200AF00
thumb_func_start sub_08054464
sub_08054464: @ 0x08054464
thumb_func_start SetBottleContents
SetBottleContents: @ 0x08054464
push {r4, lr}
adds r4, r0, #0
ldr r3, _08054498 @ =gUnk_02002A40
@@ -528,7 +528,7 @@ _08054726:
beq _0805474C
adds r0, r6, #0
movs r2, #0
bl sub_08054754
bl CreateItemDrop
b _0805474E
.align 2, 0
_0805473C: .4byte gUnk_0800143C
@@ -542,8 +542,8 @@ _0805474E:
pop {r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_start sub_08054754
sub_08054754: @ 0x08054754
thumb_func_start CreateItemDrop
CreateItemDrop: @ 0x08054754
push {r4, r5, r6, lr}
adds r6, r0, #0
adds r4, r1, #0
@@ -1545,7 +1545,7 @@ sub_08054EFC: @ 0x08054EFC
subs r1, #0x40
ldr r0, _08054F60 @ =0x00004074
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r4, #0
adds r1, #0x38
movs r0, #2
@@ -1675,7 +1675,7 @@ sub_08055014: @ 0x08055014
ldr r1, _08055034 @ =0x00000407
movs r0, #0x74
movs r2, #1
bl sub_0807B314
bl SetTileType
_0805502C:
pop {pc}
.align 2, 0
@@ -2925,7 +2925,7 @@ _080559AE:
orrs r1, r0
movs r0, #0x73
adds r2, r3, #0
bl sub_0807B314
bl SetTileType
ldrb r0, [r4, #4]
bl sub_080553E0
movs r0, #0x73
@@ -3277,9 +3277,9 @@ _08055C6C:
cmp r4, #0
beq _08055C8C
ldr r0, [r4, #0x54]
bl sub_0805E7BC
bl DeleteEntity
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_08055C8C:
movs r0, #6
movs r1, #0x10
asm/code_08056418.s
+111 -111
View File
@@ -2697,17 +2697,17 @@ _080578E0:
adds r1, #0x3f
adds r0, r6, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r4]
adds r1, #0x40
adds r0, r6, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r4]
adds r1, #0x41
adds r0, r6, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r4, #8
_08057906:
adds r0, r4, #0
@@ -3257,7 +3257,7 @@ _08057D18:
ldrh r1, [r4, #2]
ldrb r2, [r4, #4]
ldrb r3, [r4, #5]
bl sub_0800293E
bl CheckPlayerInRegion
cmp r0, #0
beq _08057D3A
movs r1, #0x36
@@ -4155,7 +4155,7 @@ sub_08058408: @ 0x08058408
ldrh r1, [r4, #0x22]
ldrh r2, [r4, #0x24]
ldrh r3, [r4, #0x26]
bl sub_0800293E
bl CheckPlayerInRegion
cmp r0, #0
beq _08058488
ldrb r0, [r4, #0xa]
@@ -5424,7 +5424,7 @@ _08058DFC:
movs r0, #1
strb r0, [r4, #0xc]
ldrh r0, [r4, #0x3a]
bl sub_0808094C
bl GetLayerByIndex
ldrh r1, [r4, #0x38]
lsls r1, r1, #1
adds r1, #4
@@ -5613,7 +5613,7 @@ sub_08058F44: @ 0x08058F44
orrs r1, r0
movs r0, #0x26
movs r2, #1
bl sub_0807B314
bl SetTileType
adds r0, r4, #0
adds r1, r5, #0
bl sub_08058F84
@@ -5897,7 +5897,7 @@ _08059182:
lsls r2, r2, #6
orrs r1, r2
ldrb r2, [r4, #0xb]
bl sub_0807B314
bl SetTileType
b _080591C8
.align 2, 0
_080591A8: .4byte 0x00000365
@@ -5982,7 +5982,7 @@ _08059238:
ldrh r1, [r4, #2]
ldrh r2, [r4, #4]
ldrh r3, [r4, #6]
bl sub_0800293E
bl CheckPlayerInRegion
cmp r0, #0
beq _0805924C
ldrh r0, [r4, #8]
@@ -6123,16 +6123,16 @@ sub_08059340: @ 0x08059340
movs r0, #0x1d
adds r1, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r0, #0
adds r1, r4, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
subs r4, #0x40
movs r0, #0
adds r1, r4, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
pop {r4, pc}
.align 2, 0
@@ -6300,7 +6300,7 @@ sub_0805947C: @ 0x0805947C
lsls r1, r1, #2
adds r1, r1, r0
ldr r0, [r1]
bl sub_0807DB2C
bl StartPlayerScript
b _080594CE
.align 2, 0
_080594B0: .4byte gRoomControls
@@ -6314,7 +6314,7 @@ _080594BC:
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl sub_0807DB2C
bl StartPlayerScript
_080594CE:
bl sub_0805E780
_080594D2:
@@ -7465,7 +7465,7 @@ _08059DD4:
ldrh r1, [r4, #2]
movs r2, #0x10
movs r3, #0x10
bl sub_0800290E
bl CheckRectOnScreen
cmp r0, #0
beq _08059E38
ldrb r1, [r4, #4]
@@ -9307,7 +9307,7 @@ _0805AC00:
ldrh r1, [r4, #6]
movs r2, #0x18
movs r3, #0x20
bl sub_0800290E
bl CheckRectOnScreen
cmp r0, #0
bne _0805AC1A
adds r0, r7, #0
@@ -10710,7 +10710,7 @@ sub_0805B6C0: @ 0x0805B6C0
ldrsh r1, [r4, r2]
ldrh r2, [r4, #0x34]
ldrh r3, [r4, #0x36]
bl sub_0800293E
bl CheckPlayerInRegion
cmp r0, #0
beq _0805B6EC
ldrh r0, [r4, #0x3e]
@@ -10814,7 +10814,7 @@ sub_0805B778: @ 0x0805B778
adds r0, #0x36
ldrb r2, [r0]
adds r0, r3, #0
bl sub_0807B314
bl SetTileType
pop {pc}
.align 2, 0
_0805B79C: .4byte gUnk_08108C9C
@@ -10913,7 +10913,7 @@ _0805B848:
ldrh r1, [r4, #2]
movs r2, #4
movs r3, #4
bl sub_0800290E
bl CheckRectOnScreen
cmp r0, #0
beq _0805B8AC
movs r6, #1
@@ -11073,7 +11073,7 @@ _0805B978:
subs r1, r1, r2
movs r2, #0
movs r3, #0
bl sub_0800290E
bl CheckRectOnScreen
cmp r0, #0
beq _0805B9B4
ldr r2, _0805B9B0 @ =gScreen
@@ -11593,7 +11593,7 @@ _0805BD76:
_0805BD94:
ldrh r0, [r4, #0x20]
ldrb r1, [r4, #0xb]
bl sub_080002B0
bl GetTileType
cmp r0, #0x76
bne _0805BDB0
ldrh r0, [r4, #0x3e]
@@ -11667,7 +11667,7 @@ _0805BE26:
_0805BE2C:
ldrh r0, [r4, #0x20]
ldrb r1, [r4, #0xb]
bl sub_080002B0
bl GetTileType
cmp r0, #0x76
bne _0805BE6C
ldrh r0, [r4, #0x3e]
@@ -11713,7 +11713,7 @@ sub_0805BE70: @ 0x0805BE70
orrs r1, r2
ldrb r2, [r0, #0xb]
adds r0, r4, #0
bl sub_0807B314
bl SetTileType
pop {r4, pc}
thumb_func_start sub_0805BE94
@@ -11733,7 +11733,7 @@ sub_0805BE94: @ 0x0805BE94
orrs r1, r0
ldrb r2, [r4, #0xb]
movs r0, #0x76
bl sub_0807B314
bl SetTileType
ldrb r0, [r4, #0xe]
bl sub_0805308C
bl sub_0805E780
@@ -11877,7 +11877,7 @@ _0805BFC0:
thumb_func_start sub_0805BFC4
sub_0805BFC4: @ 0x0805BFC4
push {lr}
bl sub_080002B0
bl GetTileType
adds r1, r0, #0
cmp r1, #0xec
beq _0805C018
@@ -11968,25 +11968,25 @@ sub_0805C050: @ 0x0805C050
subs r1, #0x41
movs r0, #0xb1
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
subs r1, #0x40
movs r0, #0xb2
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
subs r1, #0x3f
movs r0, #0xb3
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
subs r1, r5, #1
movs r0, #0xb4
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #1
movs r0, #0xb7
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
cmp r4, #1
bne _0805C11C
bl sub_08052670
@@ -12029,35 +12029,35 @@ _0805C0E0:
movs r0, #0xb5
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
b _0805C0F6
_0805C0EC:
movs r0, #0xb6
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0805C0F6:
adds r1, r5, #0
subs r1, #0x41
movs r0, #0xb8
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
subs r1, #0x40
movs r0, #0xb9
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
subs r1, #0x3f
movs r0, #0xba
movs r2, #2
bl sub_0807B314
bl SetTileType
b _0805C16E
_0805C11C:
movs r0, #0xb5
adds r1, r5, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
bl sub_08052660
cmp r0, #0
beq _0805C16E
@@ -12106,26 +12106,26 @@ sub_0805C178: @ 0x0805C178
subs r1, #0x40
movs r0, #0xf1
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
subs r1, #0x3f
movs r0, #0xf5
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #1
movs r0, #0xf6
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
adds r1, #0x40
movs r0, #0xf4
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
adds r1, #0x41
movs r0, #0xf7
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
cmp r4, #1
bne _0805C23E
bl sub_08052670
@@ -12166,34 +12166,34 @@ _0805C204:
movs r0, #0xf2
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
b _0805C21A
_0805C210:
movs r0, #0xf3
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0805C21A:
adds r1, r5, #0
subs r1, #0x3f
movs r0, #0xf8
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r1, r5, #1
movs r0, #0xf9
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
adds r1, #0x41
movs r0, #0xfa
movs r2, #2
bl sub_0807B314
bl SetTileType
b _0805C28E
_0805C23E:
movs r0, #0xf2
adds r1, r5, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
bl sub_08052660
cmp r0, #0
beq _0805C28E
@@ -12239,26 +12239,26 @@ sub_0805C294: @ 0x0805C294
subs r1, r5, #1
movs r0, #0xd1
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #1
movs r0, #0xd4
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
adds r1, #0x3f
movs r0, #0xd5
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
adds r1, #0x40
movs r0, #0xd6
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
adds r1, #0x41
movs r0, #0xd7
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
cmp r4, #1
bne _0805C35C
bl sub_08052670
@@ -12299,35 +12299,35 @@ _0805C320:
movs r0, #0xd2
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
b _0805C336
_0805C32C:
movs r0, #0xd3
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0805C336:
adds r1, r5, #0
adds r1, #0x3f
movs r0, #0xd8
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
adds r1, #0x40
movs r0, #0xd9
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
adds r1, #0x41
movs r0, #0xda
movs r2, #2
bl sub_0807B314
bl SetTileType
b _0805C3AC
_0805C35C:
movs r0, #0xd2
adds r1, r5, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
bl sub_08052660
cmp r0, #0
beq _0805C3AC
@@ -12374,26 +12374,26 @@ sub_0805C3B4: @ 0x0805C3B4
subs r1, #0x41
movs r0, #0xe1
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
subs r1, #0x40
movs r0, #0xe4
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
subs r1, r5, #1
movs r0, #0xe2
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
adds r1, #0x3f
movs r0, #0xe3
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
adds r1, #0x40
movs r0, #0xe7
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
cmp r4, #1
bne _0805C482
bl sub_08052670
@@ -12436,34 +12436,34 @@ _0805C448:
movs r0, #0xe5
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
b _0805C45E
_0805C454:
movs r0, #0xe6
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0805C45E:
adds r1, r5, #0
subs r1, #0x41
movs r0, #0xe8
movs r2, #2
bl sub_0807B314
bl SetTileType
subs r1, r5, #1
movs r0, #0xe9
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
adds r1, #0x3f
movs r0, #0xea
movs r2, #2
bl sub_0807B314
bl SetTileType
b _0805C4D4
_0805C482:
movs r0, #0xe5
adds r1, r5, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
bl sub_08052660
cmp r0, #0
beq _0805C4D4
@@ -12512,25 +12512,25 @@ sub_0805C4E0: @ 0x0805C4E0
subs r1, #0x41
movs r0, #0xc1
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
subs r1, #0x40
movs r0, #0xc2
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
subs r1, #0x3f
movs r0, #0xc3
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
subs r1, r5, #1
movs r0, #0xc4
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
adds r1, r5, #1
movs r0, #0xc7
adds r2, r4, #0
bl sub_0807B314
bl SetTileType
cmp r4, #1
bne _0805C5AC
bl sub_08052670
@@ -12573,35 +12573,35 @@ _0805C570:
movs r0, #0xc5
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
b _0805C586
_0805C57C:
movs r0, #0xc6
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0805C586:
adds r1, r5, #0
subs r1, #0x41
movs r0, #0xc8
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
subs r1, #0x40
movs r0, #0xc9
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r1, r5, #0
subs r1, #0x3f
movs r0, #0xca
movs r2, #2
bl sub_0807B314
bl SetTileType
b _0805C5FE
_0805C5AC:
movs r0, #0xc5
adds r1, r5, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
bl sub_08052660
cmp r0, #0
beq _0805C5FE
@@ -12680,7 +12680,7 @@ sub_0805C61C: @ 0x0805C61C
movs r1, #0x38
ldrsh r0, [r4, r1]
movs r1, #2
bl sub_080002B0
bl GetTileType
cmp r0, #0x75
bne _0805C670
movs r0, #1
@@ -12689,7 +12689,7 @@ sub_0805C61C: @ 0x0805C61C
movs r2, #0x38
ldrsh r1, [r4, r2]
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
b _0805C674
.align 2, 0
_0805C668: .4byte gRoomControls
@@ -12700,7 +12700,7 @@ _0805C674:
movs r5, #0x38
ldrsh r0, [r4, r5]
movs r1, #1
bl sub_080002B0
bl GetTileType
ldr r5, _0805C6B4 @ =0x0000406B
cmp r0, r5
bne _0805C694
@@ -12714,14 +12714,14 @@ _0805C694:
movs r1, #0x38
ldrsh r0, [r4, r1]
movs r1, #2
bl sub_080002B0
bl GetTileType
cmp r0, #0x76
bne _0805C6B2
movs r2, #0x38
ldrsh r1, [r4, r2]
adds r0, r5, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
bl sub_0805E780
_0805C6B2:
pop {r4, r5, pc}
@@ -13479,10 +13479,10 @@ sub_0805CBD0: @ 0x0805CBD0
adds r4, r5, #0
adds r4, #0x34
ldrb r1, [r4]
bl sub_080002B0
bl GetTileType
strh r0, [r5, #0x3c]
ldrb r0, [r4]
bl sub_0808094C
bl GetLayerByIndex
ldr r2, _0805CC38 @ =0x00005004
adds r1, r0, r2
str r1, [r5, #0x28]
@@ -13930,7 +13930,7 @@ sub_0805CFF0: @ 0x0805CFF0
bne _0805D012
ldrh r0, [r4, #4]
ldrb r1, [r4, #1]
bl sub_080002B0
bl GetTileType
ldrh r1, [r4, #6]
cmp r1, r0
bne _0805D012
@@ -14111,7 +14111,7 @@ _0805D12E:
ldrb r1, [r1]
bl sub_0807BA8C
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
adds r6, #1
cmp r6, #3
bls _0805D12E
@@ -14138,7 +14138,7 @@ _0805D184:
ldrsh r1, [r5, r2]
movs r2, #0x14
movs r3, #0x40
bl sub_0800293E
bl CheckPlayerInRegion
cmp r0, #0
beq _0805D1EE
ldr r0, _0805D1F0 @ =gLinkEntity
@@ -14197,7 +14197,7 @@ sub_0805D1FC: @ 0x0805D1FC
ldr r0, _0805D240 @ =0x00004014
ldr r1, _0805D244 @ =0x000005C3
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r3, _0805D248 @ =gRoomControls
ldrh r0, [r3, #8]
adds r0, #0xc8
@@ -14625,7 +14625,7 @@ _0805D520:
strh r5, [r6, #0x2c]
ldrh r0, [r6, #0x2e]
ldrb r1, [r6, #0xb]
bl sub_080002B0
bl GetTileType
adds r1, r0, #0
ldr r3, _0805D570 @ =0x00000317
cmp r1, r3
@@ -15725,7 +15725,7 @@ _0805DD94:
ldr r0, [r4, #0x18]
cmp r0, #0
beq _0805DDAA
bl sub_0805E7BC
bl DeleteEntity
_0805DDAA:
bl sub_0805E780
_0805DDAE:
@@ -16355,43 +16355,43 @@ _0805E25C:
subs r4, #0x41
adds r1, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0805E2D0 @ =0x00000283
adds r1, r4, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
ldr r0, _0805E2D4 @ =0x0000027D
adds r4, #1
adds r1, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r0, #0xa1
lsls r0, r0, #2
adds r1, r4, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
ldr r0, _0805E2D8 @ =0x0000027E
adds r4, #1
adds r1, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0805E2DC @ =0x00000285
adds r1, r4, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
ldr r0, _0805E2E0 @ =0x0000027F
subs r1, r5, #1
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r0, #0xa0
lsls r0, r0, #2
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0805E2E4 @ =0x00000282
adds r1, r5, #1
movs r2, #1
bl sub_0807B314
bl SetTileType
b _0805E350
.align 2, 0
_0805E2C8: .4byte gUnk_03004030
@@ -16409,43 +16409,43 @@ _0805E2E8:
subs r4, #0x41
adds r1, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0805E358 @ =0x00000273
adds r1, r4, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
ldr r0, _0805E35C @ =0x0000026D
adds r4, #1
adds r1, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r0, #0x9d
lsls r0, r0, #2
adds r1, r4, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
ldr r0, _0805E360 @ =0x0000026E
adds r4, #1
adds r1, r4, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0805E364 @ =0x00000275
adds r1, r4, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
ldr r0, _0805E368 @ =0x0000026F
subs r1, r5, #1
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r0, #0x9c
lsls r0, r0, #2
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0805E36C @ =0x00000272
adds r1, r5, #1
movs r2, #1
bl sub_0807B314
bl SetTileType
_0805E350:
ldr r1, _0805E370 @ =gUnk_02000070
movs r0, #0
asm/code_0805E744.s
+5 -5
View File
@@ -60,7 +60,7 @@ sub_0805E79C: @ 0x0805E79C
push {lr}
adds r1, r0, #0
ldrb r0, [r1, #8]
ldr r2, _0805E7B4 @ =sub_0805E7BC
ldr r2, _0805E7B4 @ =DeleteEntity
cmp r0, #9
bne _0805E7AA
ldr r2, _0805E7B8 @ =sub_0805E900
@@ -69,11 +69,11 @@ _0805E7AA:
bl _call_via_r2
pop {pc}
.align 2, 0
_0805E7B4: .4byte sub_0805E7BC
_0805E7B4: .4byte DeleteEntity
_0805E7B8: .4byte sub_0805E900
thumb_func_start sub_0805E7BC
sub_0805E7BC: @ 0x0805E7BC
thumb_func_start DeleteEntity
DeleteEntity: @ 0x0805E7BC
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, [r4, #4]
@@ -671,7 +671,7 @@ _0805EBDA:
cmp r0, #3
bne _0805EBE8
adds r0, r1, #0
bl sub_0805E7BC
bl DeleteEntity
_0805EBE8:
adds r1, r4, #0
cmp r1, r5
asm/code_0806EC20.s
+1 -1
View File
@@ -30,7 +30,7 @@ sub_0806EC38: @ 0x0806EC38
bl sub_0805EB00
cmp r0, #0
beq _0806EC4C
bl sub_0805E7BC
bl DeleteEntity
_0806EC4C:
pop {pc}
.align 2, 0
asm/code_0806ED78.s
+2 -2
View File
@@ -1612,7 +1612,7 @@ sub_0806F8DC: @ 0x0806F8DC
ldrsh r1, [r4, r2]
subs r1, #4
movs r2, #2
bl sub_080002A4
bl GetTileTypeByPos
cmp r0, #0
beq _0806F91C
ldrb r2, [r4, #0x19]
@@ -1635,7 +1635,7 @@ _0806F91C:
ldrsh r1, [r4, r2]
subs r1, #4
ldrb r2, [r5]
bl sub_080002A4
bl GetTileTypeByPos
ldrb r2, [r4, #0x19]
movs r1, #0x3f
adds r0, r1, #0
asm/code_0806FA6C.s
+7 -7
View File
@@ -1226,7 +1226,7 @@ _08070280:
lsls r2, r2, #6
orrs r1, r2
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
b _0807037A
.align 2, 0
_08070354: .4byte gRoomControls
@@ -1399,7 +1399,7 @@ sub_08070458: @ 0x08070458
adds r0, #0x38
ldrb r2, [r0]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
_0807049E:
adds r0, r4, #0
movs r1, #0x13
@@ -1470,7 +1470,7 @@ _08070518:
str r0, [r1, #0x2c]
_08070522:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _08070566
.align 2, 0
_0807052C: .4byte gLinkEntity
@@ -1755,7 +1755,7 @@ _08070734:
bl sub_0805EB2C
cmp r0, #0
beq _08070784
bl sub_0805E7BC
bl DeleteEntity
_08070784:
add sp, #4
pop {r4, r5, r6, pc}
@@ -6268,7 +6268,7 @@ _08072A14:
lsls r2, r2, #6
orrs r1, r2
ldrb r2, [r6]
bl UpdateCollisionLayer
bl SetTile
bl sub_08077B2C
adds r0, r5, #0
bl sub_08072A60
@@ -6456,7 +6456,7 @@ _08072B82:
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
ldrb r0, [r5, #0x14]
lsls r0, r0, #2
strb r0, [r5, #0x15]
@@ -6688,7 +6688,7 @@ _08072D7A:
adds r1, r4, #0
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002B0
bl GetTileType
adds r2, r0, #0
ldrb r5, [r4, #0xf]
cmp r5, #1
asm/code_080732D0.s
+6 -6
View File
@@ -143,7 +143,7 @@ sub_080733BC: @ 0x080733BC
ldr r0, [r4, #0x54]
cmp r0, #0
beq _080733FC
bl sub_0805E7BC
bl DeleteEntity
movs r0, #0
str r0, [r4, #0x54]
adds r0, r4, #0
@@ -3501,7 +3501,7 @@ sub_08074CF8: @ 0x08074CF8
adds r4, r5, #0
adds r4, #0x84
ldr r1, [r4]
bl sub_0807DF74
bl ExecuteScriptCommandSet
ldr r1, [r4]
adds r0, r5, #0
bl sub_08074D34
@@ -3818,7 +3818,7 @@ sub_08074F2C: @ 0x08074F2C
adds r5, r4, #0
adds r5, #0x84
ldr r1, [r5]
bl sub_0807DF74
bl ExecuteScriptCommandSet
ldr r1, [r5]
adds r0, r4, #0
bl sub_08074D34
@@ -3835,7 +3835,7 @@ sub_08074F44: @ 0x08074F44
ldr r0, [r0, #0x6c]
cmp r0, #0
beq _08074F5A
bl sub_0805E7BC
bl DeleteEntity
_08074F5A:
ldr r2, _08074F78 @ =gLinkState
adds r0, r2, #0
@@ -4469,7 +4469,7 @@ _080753F4:
ldr r0, [r4, #0x2c]
cmp r0, #0
beq _080754B4
bl sub_0805E7BC
bl DeleteEntity
str r6, [r4, #0x2c]
b _080754B4
_0807541E:
@@ -4535,7 +4535,7 @@ _08075492:
cmp r0, #1
beq _080754A6
adds r0, r1, #0
bl sub_0805E7BC
bl DeleteEntity
str r6, [r4, #0x2c]
_080754A6:
adds r0, r5, #0
asm/code_08077B98.s
+24 -24
View File
@@ -575,7 +575,7 @@ sub_08077F84: @ 0x08077F84
ldrsh r1, [r4, r2]
subs r1, #0xc
movs r2, #2
bl sub_080002A4
bl GetTileTypeByPos
ldr r1, _08077FE4 @ =0xFFFFFCBD
adds r0, r0, r1
cmp r0, #3
@@ -5133,7 +5133,7 @@ sub_0807A1E8: @ 0x0807A1E8
ldr r2, _0807A28C @ =gLinkEntity
adds r2, #0x38
ldrb r2, [r2]
bl sub_080002A4
bl GetTileTypeByPos
adds r2, r0, #0
ldr r1, _0807A290 @ =gLinkState
ldrh r0, [r1, #0x24]
@@ -6398,7 +6398,7 @@ sub_0807AB44: @ 0x0807AB44
adds r1, r6, #0
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002B0
bl GetTileType
movs r1, #0xb
bl sub_0806FC50
adds r5, r0, #0
@@ -6485,7 +6485,7 @@ _0807ABF4:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_0807AC44:
pop {r3, r4, r5}
mov r8, r3
@@ -7410,8 +7410,8 @@ _0807B310:
pop {pc}
.align 2, 0
thumb_func_start sub_0807B314
sub_0807B314: @ 0x0807B314
thumb_func_start SetTileType
SetTileType: @ 0x0807B314
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
adds r4, r1, #0
@@ -7421,9 +7421,9 @@ sub_0807B314: @ 0x0807B314
bhi _0807B410
adds r0, r4, #0
adds r1, r6, #0
bl sub_0801AF8C
bl DeleteLoadedTileEntity
adds r0, r6, #0
bl sub_0808094C
bl GetLayerByIndex
adds r2, r0, #0
lsls r1, r5, #1
ldr r3, _0807B3A4 @ =0x00006004
@@ -7534,7 +7534,7 @@ _0807B410:
adds r0, r5, #0
adds r1, r4, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
b _0807B430
.align 2, 0
_0807B424: .4byte 0x00003FFF
@@ -7551,7 +7551,7 @@ sub_0807B434: @ 0x0807B434
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
bl sub_080002B0
bl GetTileType
cmp r0, #0x37
bhi _0807B44A
cmp r0, #0x36
@@ -7635,7 +7635,7 @@ sub_0807B480: @ 0x0807B480
orrs r5, r0
adds r0, r4, #0
movs r1, #2
bl sub_080002B0
bl GetTileType
cmp r0, #0
beq _0807B4FA
adds r0, r6, #0
@@ -7651,7 +7651,7 @@ _0807B4FA:
ldrh r4, [r1]
adds r0, r6, #0
movs r1, #2
bl sub_080002B0
bl GetTileType
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
ldr r2, _0807B518 @ =gUnk_0811C2EC
@@ -7694,7 +7694,7 @@ _0807B54E:
adds r0, r4, #0
adds r1, r6, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
_0807B558:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -7734,7 +7734,7 @@ sub_0807B55C: @ 0x0807B55C
ldrh r0, [r0]
adds r1, r5, #0
adds r2, r6, #0
bl sub_0807B314
bl SetTileType
_0807B5AC:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -7797,7 +7797,7 @@ sub_0807B600: @ 0x0807B600
_0807B61A:
adds r0, r5, #0
movs r1, #1
bl sub_080002B0
bl GetTileType
adds r1, r0, #0
ldr r0, _0807B634 @ =0x0000026A
cmp r1, r0
@@ -7858,13 +7858,13 @@ _0807B698: .4byte 0x00000287
_0807B69C:
adds r0, r5, #0
movs r1, #2
bl sub_080002B0
bl GetTileType
cmp r0, #0
beq _0807B6EC
ldr r0, _0807B6E8 @ =0x000002F2
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
adds r0, r6, #0
movs r1, #1
bl sub_080002E0
@@ -7874,7 +7874,7 @@ _0807B69C:
lsls r0, r0, #2
adds r1, r6, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0807B6CA:
adds r0, r5, #0
adds r0, #0x40
@@ -7886,7 +7886,7 @@ _0807B6CA:
lsls r0, r0, #2
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
b _0807B6F8
.align 2, 0
_0807B6E8: .4byte 0x000002F2
@@ -7895,7 +7895,7 @@ _0807B6EC:
lsls r0, r0, #2
adds r1, r5, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0807B6F8:
adds r0, r6, #0
movs r1, #2
@@ -7905,10 +7905,10 @@ _0807B6F8:
movs r0, #0
adds r1, r6, #0
movs r2, #2
bl sub_0807B314
bl SetTileType
adds r0, r6, #0
movs r1, #1
bl sub_080002B0
bl GetTileType
ldr r1, _0807B770 @ =0x000002F2
cmp r0, r1
bne _0807B728
@@ -7916,7 +7916,7 @@ _0807B6F8:
lsls r0, r0, #2
adds r1, r6, #0
movs r2, #1
bl sub_0807B314
bl SetTileType
_0807B728:
adds r0, r5, #1
ldr r4, _0807B774 @ =gUnk_0811C2AC
@@ -7993,7 +7993,7 @@ sub_0807B778: @ 0x0807B778
ldrh r0, [r0]
adds r1, r5, #0
adds r2, r6, #0
bl sub_0807B314
bl SetTileType
_0807B7D0:
pop {r4, r5, r6, pc}
.align 2, 0
asm/code_0807B9B8.s
+8 -8
View File
@@ -14,9 +14,9 @@ sub_0807B9B8: @ 0x0807B9B8
adds r6, r2, #0
adds r0, r4, #0
adds r1, r6, #0
bl sub_0801AF8C
bl DeleteLoadedTileEntity
adds r0, r6, #0
bl sub_0808094C
bl GetLayerByIndex
adds r5, r0, #0
lsls r1, r4, #1
adds r0, r5, #4
@@ -111,9 +111,9 @@ sub_0807BA8C: @ 0x0807BA8C
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
adds r7, r1, #0
bl sub_0801AF8C
bl DeleteLoadedTileEntity
adds r0, r7, #0
bl sub_0808094C
bl GetLayerByIndex
adds r5, r0, #0
lsls r2, r4, #1
adds r1, r5, #4
@@ -227,7 +227,7 @@ _0807BB7E:
ldrsh r1, [r4, r2]
adds r1, r6, r1
adds r2, r5, #0
bl sub_0807B314
bl SetTileType
adds r4, #4
movs r1, #0
ldrsh r0, [r4, r1]
@@ -261,7 +261,7 @@ _0807BBBC:
adds r1, r5, r4
ldr r0, _0807BBE0 @ =0x00004072
mov r2, sl
bl UpdateCollisionLayer
bl SetTile
adds r4, #1
cmp r4, r8
blo _0807BBBC
@@ -1354,7 +1354,7 @@ _0807C49A:
adds r1, r4, #0
movs r2, #1
str r3, [sp, #4]
bl UpdateCollisionLayer
bl SetTile
ldr r3, [sp, #4]
_0807C4AC:
ldrh r0, [r6]
@@ -1363,7 +1363,7 @@ _0807C4AC:
adds r1, r4, #0
movs r2, #2
str r3, [sp, #4]
bl UpdateCollisionLayer
bl SetTile
ldr r3, [sp, #4]
_0807C4BE:
adds r7, #2
asm/code_0807CC3C.s
+33 -33
View File
@@ -2077,8 +2077,8 @@ _0807DB28:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_0807DB2C
sub_0807DB2C: @ 0x0807DB2C
thumb_func_start StartPlayerScript
StartPlayerScript: @ 0x0807DB2C
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0807DB5C @ =gUnk_02022750
@@ -2449,7 +2449,7 @@ sub_0807DDAC: @ 0x0807DDAC
ldr r1, [r4]
cmp r1, #0
beq _0807DDE0
bl sub_0807DF74
bl ExecuteScriptCommandSet
cmp r6, #0
beq _0807DDCE
ldr r1, [r4]
@@ -2682,8 +2682,8 @@ sub_0807DF50: @ 0x0807DF50
_0807DF6C: .4byte gUnk_02034490
_0807DF70: .4byte gUnk_0200AF00
thumb_func_start sub_0807DF74
sub_0807DF74: @ 0x0807DF74
thumb_func_start ExecuteScriptCommandSet
ExecuteScriptCommandSet: @ 0x0807DF74
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
@@ -2704,7 +2704,7 @@ _0807DF92:
strb r1, [r6, #7]
_0807DF96:
ldr r0, [r5]
bl sub_08016986
bl GetNextScriptCommandHalfword
adds r1, r0, #0
ldr r0, _0807DFF4 @ =0x0000FFFF
cmp r1, r0
@@ -2787,7 +2787,7 @@ sub_0807E024: @ 0x0807E024
ldr r0, [r4]
adds r0, #2
str r0, [r4]
bl sub_08016986
bl GetNextScriptCommandHalfword
lsls r0, r0, #0x10
asrs r1, r0, #0x10
lsrs r0, r0, #0x1f
@@ -2857,7 +2857,7 @@ sub_0807E0A0: @ 0x0807E0A0
push {r4, lr}
adds r4, r1, #0
ldr r0, [r4]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
str r0, [r4]
ldr r1, _0807E0B4 @ =gUnk_02033280
movs r0, #0
@@ -2922,7 +2922,7 @@ sub_0807E10C: @ 0x0807E10C
adds r5, r0, #0
adds r4, r1, #0
ldr r0, [r4]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
adds r2, r0, #0
adds r0, r5, #0
adds r1, r4, #0
@@ -2935,11 +2935,11 @@ sub_0807E124: @ 0x0807E124
adds r6, r0, #0
adds r4, r1, #0
ldr r0, [r4]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
adds r5, r0, #0
ldr r0, [r4]
adds r0, #6
bl sub_0801698E
bl GetNextScriptCommandWord
str r0, [r4, #4]
adds r0, r6, #0
adds r1, r4, #0
@@ -2951,7 +2951,7 @@ sub_0807E124: @ 0x0807E124
sub_0807E148: @ 0x0807E148
push {lr}
ldr r0, [r1]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
bl LoadRoomEntityList
pop {pc}
.align 2, 0
@@ -2961,7 +2961,7 @@ sub_0807E158: @ 0x0807E158
push {r4, r5, lr}
adds r4, r1, #0
ldr r0, [r4]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
adds r2, r0, #0
movs r5, #0
ldr r3, _0807E184 @ =gUnk_02033280
@@ -2988,7 +2988,7 @@ sub_0807E188: @ 0x0807E188
push {r4, lr}
adds r4, r1, #0
ldr r0, [r4]
bl sub_0801698A
bl GetNextScriptCommandHalfwordAfterCommandMetadata
cmp r0, #0x51
beq _0807E1B4
cmp r0, #0x51
@@ -3087,7 +3087,7 @@ sub_0807E240: @ 0x0807E240
push {r4, lr}
adds r4, r1, #0
ldr r0, [r4]
bl sub_0801698A
bl GetNextScriptCommandHalfwordAfterCommandMetadata
bl GetProgressFlag
str r0, [r4, #0x14]
ldr r2, _0807E25C @ =gUnk_02033280
@@ -3127,7 +3127,7 @@ sub_0807E280: @ 0x0807E280
ands r2, r0
ldrh r0, [r1, #2]
ldrh r1, [r1, #4]
bl sub_0800293E
bl CheckPlayerInRegion
str r0, [r4, #0x14]
ldr r2, _0807E2A4 @ =gUnk_02033280
ldrb r1, [r2, #7]
@@ -3156,7 +3156,7 @@ sub_0807E2A8: @ 0x0807E2A8
ldrsh r1, [r5, r7]
ldrh r4, [r4, #8]
subs r1, r1, r4
bl sub_0800293E
bl CheckPlayerInRegion
str r0, [r6, #0x14]
ldr r2, _0807E2E0 @ =gUnk_02033280
ldrb r1, [r2, #7]
@@ -3496,7 +3496,7 @@ sub_0807E538: @ 0x0807E538
push {r4, lr}
adds r4, r1, #0
ldr r0, [r4]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
ldr r1, _0807E55C @ =gLinkState
ldr r1, [r1, #0x30]
ands r0, r1
@@ -3600,7 +3600,7 @@ _0807E5F4: .4byte gUnk_02033280
sub_0807E5F8: @ 0x0807E5F8
push {lr}
ldr r0, [r1]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
ldr r2, _0807E60C @ =gUnk_02033280
ldr r1, [r2]
orrs r1, r0
@@ -3613,7 +3613,7 @@ _0807E60C: .4byte gUnk_02033280
sub_0807E610: @ 0x0807E610
push {lr}
ldr r0, [r1]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
ldr r2, _0807E624 @ =gUnk_02033280
ldr r1, [r2]
bics r1, r0
@@ -3685,7 +3685,7 @@ sub_0807E680: @ 0x0807E680
push {r4, lr}
adds r4, r1, #0
ldr r0, [r4]
bl sub_0801698A
bl GetNextScriptCommandHalfwordAfterCommandMetadata
strh r0, [r4, #0x10]
pop {r4, pc}
.align 2, 0
@@ -3694,7 +3694,7 @@ sub_0807E680: @ 0x0807E680
sub_0807E690: @ 0x0807E690
push {lr}
ldr r0, [r1]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
ldr r2, _0807E6A8 @ =gUnk_02033280
ldr r1, [r2]
ands r1, r0
@@ -3711,7 +3711,7 @@ _0807E6A8: .4byte gUnk_02033280
sub_0807E6AC: @ 0x0807E6AC
push {lr}
ldr r0, [r1]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
ldr r3, _0807E6C8 @ =gUnk_02033280
ldr r2, [r3]
adds r1, r2, #0
@@ -3837,7 +3837,7 @@ _0807E784: .4byte gUnk_02033280
sub_0807E788: @ 0x0807E788
push {lr}
ldr r0, [r1]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
ldr r1, _0807E798 @ =gUnk_03000FD0
str r0, [r1, #4]
pop {pc}
@@ -3997,7 +3997,7 @@ _0807E894: .4byte gLinkState
sub_0807E898: @ 0x0807E898
push {lr}
ldr r0, [r1]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
ldr r3, _0807E8C0 @ =gLinkState
strb r0, [r3, #0xc]
lsrs r2, r0, #8
@@ -4020,8 +4020,8 @@ _0807E8C0: .4byte gLinkState
sub_0807E8C4: @ 0x0807E8C4
push {lr}
ldr r0, [r1]
bl sub_08016998
bl sub_0807DB2C
bl GetNextScriptCommandWordAfterCommandMetadata
bl StartPlayerScript
pop {pc}
.align 2, 0
@@ -4067,7 +4067,7 @@ sub_0807E914: @ 0x0807E914
push {r4, lr}
adds r4, r1, #0
ldr r0, [r4]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
str r0, [r4, #4]
pop {r4, pc}
.align 2, 0
@@ -4469,7 +4469,7 @@ sub_0807EBC8: @ 0x0807EBC8
push {r4, lr}
adds r4, r0, #0
ldr r0, [r1]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
str r0, [r4, #0x20]
pop {r4, pc}
.align 2, 0
@@ -5040,7 +5040,7 @@ _0807EFD2:
sub_0807EFD4: @ 0x0807EFD4
push {lr}
ldr r0, [r1]
bl sub_08016998
bl GetNextScriptCommandWordAfterCommandMetadata
bl PlaySFX
pop {pc}
.align 2, 0
@@ -6170,7 +6170,7 @@ sub_0807F78C: @ 0x0807F78C
ldrb r5, [r0, #6]
_0807F79A:
adds r0, r5, #0
bl sub_08053FD0
bl GetSaleItemConfirmMessageID
adds r4, r0, #0
adds r0, r5, #0
bl sub_08053FE0
@@ -6373,7 +6373,7 @@ _0807F914: .4byte 0x000003FF
sub_0807F918: @ 0x0807F918
push {lr}
ldr r0, [r1, #4]
bl sub_08054398
bl PutItemOnSlot
pop {pc}
.align 2, 0
@@ -6420,7 +6420,7 @@ sub_0807F950: @ 0x0807F950
bl sub_0805EB2C
cmp r0, #0
beq _0807F96C
bl sub_0805E7BC
bl DeleteEntity
_0807F96C:
add sp, #4
pop {pc}
asm/code_080A5574.s
+44 -44
View File
@@ -4889,7 +4889,7 @@ _080A7BFC: .4byte gLinkState
thumb_func_start sub_080A7C00
sub_080A7C00: @ 0x080A7C00
push {r4, lr}
bl sub_080A7C38
bl GiveItemWithCutscene
adds r4, r0, #0
cmp r4, #0
beq _080A7C16
@@ -4903,7 +4903,7 @@ _080A7C16:
thumb_func_start sub_080A7C18
sub_080A7C18: @ 0x080A7C18
push {lr}
bl sub_080A7C38
bl GiveItemWithCutscene
adds r2, r0, #0
cmp r2, #0
beq _080A7C32
@@ -4918,8 +4918,8 @@ _080A7C32:
.align 2, 0
_080A7C34: .4byte gLinkEntity
thumb_func_start sub_080A7C38
sub_080A7C38: @ 0x080A7C38
thumb_func_start GiveItemWithCutscene
GiveItemWithCutscene: @ 0x080A7C38
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
adds r6, r1, #0
@@ -5516,7 +5516,7 @@ sub_080A8064: @ 0x080A8064
cmp r0, #0x80
bne _080A8078
adds r0, r1, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A8086
_080A8078:
adds r0, r1, #0
@@ -5556,7 +5556,7 @@ sub_080A80A0: @ 0x080A80A0
cmp r0, #0
beq _080A80C4
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A80F0
_080A80C4:
adds r0, r4, #0
@@ -5596,7 +5596,7 @@ sub_080A80F4: @ 0x080A80F4
cmp r0, #0
bne _080A8116
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_080A8116:
pop {r4, pc}
@@ -5618,7 +5618,7 @@ sub_080A8118: @ 0x080A8118
b _080A815A
_080A813A:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A8176
_080A8142:
ldrb r1, [r4, #0x10]
@@ -5702,7 +5702,7 @@ sub_080A81C4: @ 0x080A81C4
cmp r0, #0x80
bne _080A81D8
adds r0, r1, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A81DE
_080A81D8:
adds r0, r1, #0
@@ -5740,7 +5740,7 @@ sub_080A81FC: @ 0x080A81FC
cmp r0, #0
beq _080A8222
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A8246
_080A8222:
adds r0, r4, #0
@@ -5814,7 +5814,7 @@ sub_080A827C: @ 0x080A827C
cmp r0, #0
bne _080A82B2
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_080A82B2:
pop {r4, pc}
@@ -5832,7 +5832,7 @@ sub_080A82B4: @ 0x080A82B4
cmp r0, #0
bne _080A82D6
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_080A82D6:
pop {r4, pc}
@@ -6080,7 +6080,7 @@ sub_080A8470: @ 0x080A8470
bl sub_08004488
_080A848E:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A84C6
_080A8496:
adds r0, r4, #0
@@ -6451,7 +6451,7 @@ _080A8760: .4byte gRoomControls
_080A8764: .4byte gLinkEntity
_080A8768:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_080A876E:
pop {r4, r5, r6, pc}
@@ -6842,7 +6842,7 @@ _080A8A2A:
str r0, [r4, #0x50]
_080A8A3E:
adds r0, r5, #0
bl sub_0805E7BC
bl DeleteEntity
_080A8A44:
pop {r4, r5, pc}
.align 2, 0
@@ -6860,7 +6860,7 @@ sub_080A8A48: @ 0x080A8A48
cmp r0, #0
beq _080A8A64
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_080A8A64:
pop {r4, pc}
.align 2, 0
@@ -6922,14 +6922,14 @@ sub_080A8AC8: @ 0x080A8AC8
ldr r5, [r4, #0x50]
cmp r5, #0
bne _080A8AD8
bl sub_0805E7BC
bl DeleteEntity
b _080A8B34
_080A8AD8:
ldr r0, [r5, #4]
cmp r0, #0
bne _080A8AE6
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A8B34
_080A8AE6:
ldrb r0, [r4, #0x18]
@@ -6988,7 +6988,7 @@ sub_080A8B38: @ 0x080A8B38
cmp r0, #0
beq _080A8B5E
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A8B74
_080A8B5E:
adds r0, r4, #0
@@ -7019,7 +7019,7 @@ sub_080A8B78: @ 0x080A8B78
cmp r0, #0
beq _080A8B94
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_080A8B94:
pop {r4, pc}
.align 2, 0
@@ -7081,14 +7081,14 @@ sub_080A8BF8: @ 0x080A8BF8
ldr r5, [r4, #0x50]
cmp r5, #0
bne _080A8C08
bl sub_0805E7BC
bl DeleteEntity
b _080A8C48
_080A8C08:
ldr r0, [r5, #4]
cmp r0, #0
bne _080A8C16
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A8C48
_080A8C16:
ldrb r0, [r4, #0x18]
@@ -7133,7 +7133,7 @@ sub_080A8C4C: @ 0x080A8C4C
cmp r0, #0
beq _080A8C72
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A8C88
_080A8C72:
adds r0, r4, #0
@@ -7164,7 +7164,7 @@ sub_080A8C8C: @ 0x080A8C8C
cmp r0, #0
beq _080A8CA8
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_080A8CA8:
pop {r4, pc}
.align 2, 0
@@ -7226,14 +7226,14 @@ sub_080A8D0C: @ 0x080A8D0C
ldr r5, [r4, #0x50]
cmp r5, #0
bne _080A8D1C
bl sub_0805E7BC
bl DeleteEntity
b _080A8D5C
_080A8D1C:
ldr r0, [r5, #4]
cmp r0, #0
bne _080A8D2A
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A8D5C
_080A8D2A:
ldrb r0, [r4, #0x18]
@@ -7278,7 +7278,7 @@ sub_080A8D60: @ 0x080A8D60
cmp r0, #0
beq _080A8D86
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A8D9C
_080A8D86:
adds r0, r4, #0
@@ -7309,7 +7309,7 @@ sub_080A8DA0: @ 0x080A8DA0
cmp r0, #0
beq _080A8DBC
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_080A8DBC:
pop {r4, pc}
.align 2, 0
@@ -7736,7 +7736,7 @@ sub_080A90D8: @ 0x080A90D8
mov r2, ip
strh r4, [r2]
adds r0, r5, #0
bl sub_080002A0
bl GetTileTypeByEntity
cmp r0, #0x13
beq _080A9128
cmp r0, #0x34
@@ -7804,7 +7804,7 @@ _080A917C:
bl sub_0803C0AC
_080A9198:
adds r0, r5, #0
bl sub_0805E7BC
bl DeleteEntity
b _080A91D8
.align 2, 0
_080A91A0: .4byte gLinkEntity
@@ -8368,7 +8368,7 @@ sub_080A95BC: @ 0x080A95BC
cmp r0, #0
beq _080A95D8
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_080A95D8:
pop {r4, pc}
.align 2, 0
@@ -9768,7 +9768,7 @@ _080A9FF2:
ldrh r0, [r4]
adds r5, #0x38
ldrb r1, [r5]
bl sub_080002B0
bl GetTileType
movs r1, #0x80
lsls r1, r1, #7
cmp r0, r1
@@ -9776,7 +9776,7 @@ _080A9FF2:
ldr r0, _080AA040 @ =0x00004005
ldrh r1, [r4]
ldrb r2, [r5]
bl UpdateCollisionLayer
bl SetTile
_080AA034:
pop {r4, r5, pc}
.align 2, 0
@@ -10349,7 +10349,7 @@ _080AA474:
bl CopyPosition
_080AA48A:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
pop {r4, pc}
.align 2, 0
@@ -10358,7 +10358,7 @@ sub_080AA494: @ 0x080AA494
push {r4, r5, r6, lr}
adds r5, r0, #0
movs r4, #0
bl sub_080002A0
bl GetTileTypeByEntity
adds r2, r0, #0
ldr r1, _080AA4A4 @ =gUnk_08129FD0
b _080AA4AA
@@ -10428,7 +10428,7 @@ _080AA4EE:
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_080AA52C: .4byte gRoomControls
@@ -11146,7 +11146,7 @@ sub_080AAA68: @ 0x080AAA68
adds r0, #0x38
ldrb r2, [r0]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_080AAAA0: .4byte gUnk_0812A084
@@ -12511,7 +12511,7 @@ sub_080AB4A4: @ 0x080AB4A4
beq _080AB4F2
strh r5, [r7]
adds r0, r6, #0
bl sub_080002A0
bl GetTileTypeByEntity
cmp r0, #0x13
beq _080AB4E2
cmp r0, #0x34
@@ -12739,7 +12739,7 @@ _080AB640:
bl CreateFx
_080AB67A:
adds r0, r6, #0
bl sub_0805E7BC
bl DeleteEntity
movs r0, #1
b _080AB68E
_080AB684:
@@ -13222,7 +13222,7 @@ sub_080AB9FC: @ 0x080AB9FC
adds r4, r1, #0
adds r0, #0x38
ldrb r0, [r0]
bl sub_0808094C
bl GetLayerByIndex
movs r1, #0x2e
ldrsh r3, [r5, r1]
ldr r2, _080ABA4C @ =gRoomControls
@@ -13636,7 +13636,7 @@ sub_080ABCC4: @ 0x080ABCC4
strh r1, [r0]
ldrh r0, [r0]
movs r1, #2
bl sub_080002B0
bl GetTileType
adds r1, r5, #0
adds r1, #0x76
strh r0, [r1]
@@ -13720,7 +13720,7 @@ sub_080ABD70: @ 0x080ABD70
strh r1, [r4]
ldrh r0, [r4]
movs r1, #2
bl sub_080002B0
bl GetTileType
adds r1, r5, #0
adds r1, #0x76
strh r0, [r1]
@@ -13733,7 +13733,7 @@ sub_080ABD70: @ 0x080ABD70
ldrh r1, [r4]
movs r0, #0x6e
movs r2, #2
bl sub_0807B314
bl SetTileType
b _080ABDEE
.align 2, 0
_080ABDDC: .4byte gRoomControls
@@ -13742,7 +13742,7 @@ _080ABDE4:
ldrh r1, [r4]
movs r0, #0x6d
movs r2, #2
bl sub_0807B314
bl SetTileType
_080ABDEE:
adds r0, r5, #0
adds r0, #0x5a
asm/code_080AD90C.s
+3 -3
View File
@@ -1738,7 +1738,7 @@ sub_080AE58C: @ 0x080AE58C
adds r4, r2, #0
adds r0, #0x38
ldrb r0, [r0]
bl sub_0808094C
bl GetLayerByIndex
ldr r1, _080AE624 @ =0x00002004
adds r5, r0, r1
ldr r2, [sp]
@@ -3220,7 +3220,7 @@ _080AF0C4:
sub_080AF0C8: @ 0x080AF0C8
push {r4, lr}
adds r4, r0, #0
bl sub_080002A0
bl GetTileTypeByEntity
cmp r0, #0x88
beq _080AF10A
cmp r0, #0x88
@@ -3473,7 +3473,7 @@ sub_080AF284: @ 0x080AF284
movs r0, #0x78
movs r2, #0x78
movs r3, #0x50
bl sub_0800293E
bl CheckPlayerInRegion
cmp r0, #0
beq _080AF2BC
bl sub_08052E8C
asm/crenalBeanSprout.s
+4 -4
View File
@@ -71,7 +71,7 @@ _08096368:
adds r1, #0x38
ldrb r2, [r1]
movs r1, #0xdc
bl UpdateCollisionLayer
bl SetTile
b _0809650A
.align 2, 0
_0809639C: .4byte gLinkEntity
@@ -230,7 +230,7 @@ _080964C4:
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
b _0809651A
.align 2, 0
_080964F0: .4byte 0x00004032
@@ -576,7 +576,7 @@ sub_08096780: @ 0x08096780
adds r0, r0, r1
ldrh r4, [r0]
adds r0, r5, #0
bl sub_080002A0
bl GetTileTypeByEntity
cmp r4, r0
bne _080967DC
adds r0, r5, #0
@@ -989,7 +989,7 @@ sub_08096A78: @ 0x08096A78
orrs r1, r2
adds r4, #0x38
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_08096ACC: .4byte 0x0000403B
asm/cuccoAggr.s
+1 -1
View File
@@ -447,7 +447,7 @@ _08038FFC:
cmp r0, #0
beq _08039018
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_08039018:
pop {r4, pc}
.align 2, 0
asm/dampe.s
+4 -4
View File
@@ -188,20 +188,20 @@ sub_0806BEFC: @ 0x0806BEFC
lsls r0, r0, #1
ldr r1, _0806BF2C @ =0x0000058E
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0806BF30 @ =0x0000017F
ldr r1, _0806BF34 @ =0x0000058F
movs r2, #1
bl sub_0807B314
bl SetTileType
movs r0, #0xc0
lsls r0, r0, #1
ldr r1, _0806BF38 @ =0x000005CE
movs r2, #1
bl sub_0807B314
bl SetTileType
ldr r0, _0806BF3C @ =0x00000181
ldr r1, _0806BF40 @ =0x000005CF
movs r2, #1
bl sub_0807B314
bl SetTileType
pop {pc}
.align 2, 0
_0806BF2C: .4byte 0x0000058E
asm/deathFx.s
+1 -1
View File
@@ -266,7 +266,7 @@ sub_080817FC: @ 0x080817FC
adds r1, #0x6e
ldrb r1, [r1]
movs r2, #0
bl sub_08054754
bl CreateItemDrop
pop {pc}
thumb_func_start sub_0808180C
asm/dog.s
+1 -1
View File
@@ -141,7 +141,7 @@ _08069BF2:
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_08069C30:
pop {r4, r5, r6, pc}
.align 2, 0
asm/doorMimic.s
+2 -2
View File
@@ -67,7 +67,7 @@ sub_08022004: @ 0x08022004
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
adds r0, r4, #0
movs r1, #5
movs r2, #0
@@ -335,7 +335,7 @@ sub_080221C0: @ 0x080221C0
ldrh r0, [r0]
ldrb r2, [r5]
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_08022220: .4byte gRoomControls
asm/enemy49.s
+1 -1
View File
@@ -154,7 +154,7 @@ sub_0803CF94: @ 0x0803CF94
adds r1, r4, #0
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002B0
bl GetTileType
cmp r0, #0x76
bne _0803CFBA
adds r1, r4, #0
asm/enemy64.s
+6 -6
View File
@@ -102,19 +102,19 @@ sub_08049100: @ 0x08049100
adds r0, r4, #0
movs r1, #0xa
movs r2, #2
bl UpdateCollisionLayer
bl SetTile
adds r0, r4, #0
movs r1, #0x4a
movs r2, #2
bl UpdateCollisionLayer
bl SetTile
adds r0, r4, #0
movs r1, #0x8a
movs r2, #2
bl UpdateCollisionLayer
bl SetTile
adds r0, r4, #0
movs r1, #0xca
movs r2, #2
bl UpdateCollisionLayer
bl SetTile
bl sub_0805E780
b _0804916E
.align 2, 0
@@ -1152,7 +1152,7 @@ _080498FC:
movs r1, #0x4a
_0804990E:
movs r2, #2
bl UpdateCollisionLayer
bl SetTile
movs r0, #0x71
bl PlaySFX
b _0804993E
@@ -1168,7 +1168,7 @@ _08049920:
ldr r0, _08049940 @ =0x00004081
movs r1, #0xa
movs r2, #2
bl UpdateCollisionLayer
bl SetTile
movs r0, #0x71
bl PlaySFX
_0804993E:
asm/evilSpirit.s
+1 -1
View File
@@ -407,7 +407,7 @@ _0808657E:
ldr r0, [r4, #0x54]
ldr r1, [r0, #0x50]
str r1, [r4, #0x54]
bl sub_0805E7BC
bl DeleteEntity
adds r5, #1
cmp r5, #3
bls _0808657E
asm/eyegore.s
+10 -10
View File
@@ -719,19 +719,19 @@ sub_08030F00: @ 0x08030F00
ldrb r2, [r6]
adds r0, r5, #0
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrb r2, [r6]
adds r0, r5, #0
mov r1, sl
bl UpdateCollisionLayer
bl SetTile
ldrb r2, [r6]
adds r0, r5, #0
mov r1, sb
bl UpdateCollisionLayer
bl SetTile
ldrb r2, [r6]
adds r0, r5, #0
mov r1, r8
bl UpdateCollisionLayer
bl SetTile
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
@@ -770,27 +770,27 @@ sub_08030FB4: @ 0x08030FB4
adds r5, #0x38
ldrb r2, [r5]
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
adds r0, #0x82
ldrh r0, [r0]
adds r1, r4, #1
ldrb r2, [r5]
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
adds r0, #0x84
ldrh r0, [r0]
adds r1, r4, #0
adds r1, #0x40
ldrb r2, [r5]
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
adds r0, #0x86
ldrh r0, [r0]
adds r4, #0x41
ldrb r2, [r5]
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_08031020: .4byte gRoomControls
@@ -955,7 +955,7 @@ _08031120:
adds r3, r3, r7
mov r8, r3
ldrb r2, [r3]
bl sub_080002A4
bl GetTileTypeByPos
adds r6, r0, #0
movs r1, #0x2e
ldrsh r0, [r7, r1]
@@ -974,7 +974,7 @@ _08031120:
adds r1, r1, r2
mov r3, r8
ldrb r2, [r3]
bl sub_080002A4
bl GetTileTypeByPos
adds r1, r0, #0
ldr r2, _080311B8 @ =gUnk_080B3E80
adds r6, r6, r2
asm/ezloCap.s
+1 -1
View File
@@ -554,7 +554,7 @@ _0806DC88:
adds r4, #2
ldr r0, _0806DC9C @ =0x00004072
movs r2, #1
bl sub_0807B314
bl SetTileType
_0806DC94:
ldrh r0, [r4]
cmp r0, #0
asm/festari.s
+1 -1
View File
@@ -63,7 +63,7 @@ _0805FE80:
adds r4, #0x84
ldr r1, [r4]
adds r0, r5, #0
bl sub_0807DF74
bl ExecuteScriptCommandSet
ldr r1, [r4]
adds r0, r5, #0
bl sub_0805FF2C
asm/figurineDevice.s
+5 -5
View File
@@ -495,16 +495,16 @@ sub_08087F58: @ 0x08087F58
subs r1, #1
adds r0, r5, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r4]
adds r0, r5, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r4]
adds r1, #1
adds r0, r5, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_08087F8C:
pop {r4, r5, pc}
.align 2, 0
@@ -1372,7 +1372,7 @@ sub_0808861C: @ 0x0808861C
movs r1, #0x54
movs r2, #0xc
movs r3, #8
bl sub_0800293E
bl CheckPlayerInRegion
str r0, [r4, #0x14]
ldr r1, _08088650 @ =gLinkEntity
ldrb r0, [r1, #0x14]
@@ -1404,7 +1404,7 @@ sub_08088658: @ 0x08088658
movs r1, #0x78
movs r2, #0x10
movs r3, #8
bl sub_0800293E
bl CheckPlayerInRegion
str r0, [r4, #0x14]
ldr r0, _08088684 @ =gLinkEntity
movs r1, #0x36
asm/fireballGuy.s
+1 -1
View File
@@ -203,7 +203,7 @@ _080454EE:
bl CopyPosition
_08045506:
mov r0, r8
bl sub_0805E7BC
bl DeleteEntity
_0804550C:
add sp, #0x10
pop {r3, r4}
asm/fireplace.s
+3 -3
View File
@@ -82,7 +82,7 @@ _0809B73A:
adds r2, r6, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_0809B78A:
adds r0, r6, #0
bl sub_0809B7A0
@@ -113,7 +113,7 @@ _0809B7BC:
sub_0809B7C0: @ 0x0809B7C0
push {r4, lr}
adds r4, r0, #0
bl sub_080002A0
bl GetTileTypeByEntity
ldr r1, _0809B7D8 @ =0xFFFFBF9F
adds r0, r0, r1
cmp r0, #1
@@ -167,7 +167,7 @@ sub_0809B7DC: @ 0x0809B7DC
adds r2, r6, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
movs r0, #1
strb r0, [r6, #0xe]
pop {r4, r5, r6, pc}
asm/flyingPot.s
+7 -7
View File
@@ -101,7 +101,7 @@ sub_080370A4: @ 0x080370A4
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
b _0803711E
.align 2, 0
_0803710C: .4byte gRoomControls
@@ -210,7 +210,7 @@ sub_0803718C: @ 0x0803718C
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_080371DA:
adds r0, r5, #0
bl sub_0806F520
@@ -294,7 +294,7 @@ sub_08037220: @ 0x08037220
lsls r0, r0, #7
ldrb r2, [r6]
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
adds r0, r5, #0
movs r1, #5
bl UpdateSprite
@@ -308,7 +308,7 @@ sub_08037280: @ 0x08037280
adds r5, r0, #0
bl sub_08037418
adds r0, r5, #0
bl sub_080002A0
bl GetTileTypeByEntity
movs r1, #0x80
lsls r1, r1, #7
cmp r0, r1
@@ -335,7 +335,7 @@ sub_08037280: @ 0x08037280
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
adds r0, r5, #0
bl sub_08037408
_080372CC:
@@ -420,7 +420,7 @@ sub_080372E8: @ 0x080372E8
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_0803736E:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -551,7 +551,7 @@ sub_08037418: @ 0x08037418
ldrh r0, [r0]
ldrb r2, [r6]
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
bl sub_0805E780
_08037460:
pop {r4, r5, r6, pc}
asm/flyingSkull.s
+10 -10
View File
@@ -101,7 +101,7 @@ sub_08039BF8: @ 0x08039BF8
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
b _08039C72
.align 2, 0
_08039C60: .4byte gRoomControls
@@ -208,7 +208,7 @@ sub_08039CE0: @ 0x08039CE0
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_08039D2A:
adds r0, r5, #0
bl sub_0806F520
@@ -294,7 +294,7 @@ sub_08039D74: @ 0x08039D74
ldr r0, _08039DD4 @ =0x00004060
ldrb r2, [r6]
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
adds r0, r5, #0
movs r1, #0
bl UpdateSprite
@@ -312,7 +312,7 @@ sub_08039DD8: @ 0x08039DD8
cmp r0, #0
bne _08039E38
adds r0, r5, #0
bl sub_080002A0
bl GetTileTypeByEntity
ldr r1, _08039E30 @ =0x00004073
cmp r0, r1
bne _08039E28
@@ -338,7 +338,7 @@ sub_08039DD8: @ 0x08039DD8
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
adds r0, r5, #0
bl sub_0803A0E0
_08039E28:
@@ -411,9 +411,9 @@ _08039E74:
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
adds r0, r5, #0
bl sub_0805E7BC
bl DeleteEntity
_08039EC6:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -476,7 +476,7 @@ sub_08039EE4: @ 0x08039EE4
mov r2, ip
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_08039F40: .4byte gUnk_080FD340
@@ -610,7 +610,7 @@ sub_08039FAC: @ 0x08039FAC
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_0803A03A:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -751,7 +751,7 @@ sub_0803A100: @ 0x0803A100
ldrh r0, [r0]
ldrb r2, [r6]
adds r1, r4, #0
bl UpdateCollisionLayer
bl SetTile
bl sub_0805E780
_0803A148:
pop {r4, r5, r6, pc}
asm/forestMinish.s
+1 -1
View File
@@ -455,7 +455,7 @@ _0806031C:
beq _08060336
bl sub_080A29BC
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_08060336:
subs r5, #1
cmp r5, #0
asm/fourElements.s
+2 -2
View File
@@ -79,7 +79,7 @@ sub_080A01E0: @ 0x080A01E0
strb r3, [r0]
_080A0246:
ldr r0, _080A028C @ =gUnk_0800A0B4
bl sub_0807DB2C
bl StartPlayerScript
ldr r1, _080A0284 @ =gScreen
adds r2, r1, #0
adds r2, #0x66
@@ -155,7 +155,7 @@ sub_080A02CC: @ 0x080A02CC
cmp r0, #0
beq _080A0342
ldr r0, [r4, #0x54]
bl sub_0805E7BC
bl DeleteEntity
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
asm/frozenWaterElement.s
+27 -27
View File
@@ -278,135 +278,135 @@ sub_0809C0A8: @ 0x0809C0A8
adds r4, #0x38
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
subs r1, #0x40
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
subs r1, #0x3f
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
subs r1, r6, #2
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
subs r1, r6, #1
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldrb r2, [r4]
adds r0, r5, #0
adds r1, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #1
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #2
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
adds r1, #0x3e
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
adds r1, #0x3f
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
adds r1, #0x40
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
adds r1, #0x41
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
adds r1, #0x42
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
adds r1, #0x7f
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
adds r1, #0x80
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
adds r1, #0x81
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809C21C @ =0x0000013F
adds r1, r6, r0
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
movs r0, #0xa0
lsls r0, r0, #1
adds r1, r6, r0
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809C220 @ =0x00000141
adds r1, r6, r0
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809C224 @ =0x0000017F
adds r1, r6, r0
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809C228 @ =0x00000181
adds r1, r6, r0
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809C22C @ =0x000001BD
adds r1, r6, r0
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
movs r0, #0xdf
lsls r0, r0, #1
adds r1, r6, r0
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809C230 @ =0x000001BF
adds r1, r6, r0
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809C234 @ =0x000001C1
adds r1, r6, r0
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
movs r0, #0xe1
lsls r0, r0, #1
adds r1, r6, r0
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809C238 @ =0x000001C3
adds r1, r6, r0
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_0809C214: .4byte gRoomControls
asm/furniture.s
+27 -27
View File
@@ -110,12 +110,12 @@ _08090650:
subs r1, #0x80
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r5]
subs r1, #0x40
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
b _080906E6
.align 2, 0
_0809067C: .4byte 0x00004017
@@ -149,7 +149,7 @@ _08090680:
adds r2, r7, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
b _080906E6
.align 2, 0
_080906C0: .4byte 0x00004026
@@ -269,11 +269,11 @@ _080907A0:
adds r0, r6, #0
adds r1, r4, #0
movs r2, #2
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
adds r1, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r4, #0
adds r1, #0x40
movs r0, #0
@@ -426,7 +426,7 @@ _08090938:
ldrh r1, [r4]
subs r1, #0x40
ldrb r2, [r5]
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r4]
subs r1, #0x40
ldrb r2, [r5]
@@ -436,7 +436,7 @@ _08090938:
ldrh r1, [r4]
ldrb r2, [r5]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r4]
adds r1, #0x40
ldrb r2, [r5]
@@ -463,18 +463,18 @@ _08090994:
adds r4, #0x38
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r5]
subs r1, #0x40
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r5]
subs r1, #0x3f
ldrb r2, [r4]
_080909BC:
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
b _080909DC
.align 2, 0
_080909C4: .4byte 0x00004023
@@ -487,7 +487,7 @@ _080909C8:
adds r2, r7, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_080909DC:
pop {r3, r4}
mov r8, r3
@@ -617,7 +617,7 @@ _08090AB0:
cmp r0, #0x1e
beq _08090B60
adds r0, r5, #0
bl sub_080002A0
bl GetTileTypeByEntity
ldr r1, _08090B08 @ =0x00004017
cmp r0, r1
bne _08090B60
@@ -627,18 +627,18 @@ _08090AB0:
ldrh r1, [r4]
adds r5, #0x38
ldrb r2, [r5]
bl UpdateCollisionLayer
bl SetTile
ldr r6, _08090B10 @ =0x0000403D
ldrh r1, [r4]
subs r1, #0x40
ldrb r2, [r5]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r4]
subs r1, #0x80
ldrb r2, [r5]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
b _08090B60
.align 2, 0
_08090B00: .4byte gLinkEntity
@@ -660,7 +660,7 @@ _08090B14:
bl UpdateSpriteOrderAndFlip
_08090B2C:
adds r0, r5, #0
bl sub_080002A0
bl GetTileTypeByEntity
ldr r6, _08090B64 @ =0x00004017
cmp r0, r6
beq _08090B60
@@ -670,17 +670,17 @@ _08090B2C:
adds r5, #0x38
ldrb r2, [r5]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r4]
subs r1, #0x40
ldrb r2, [r5]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08090B68 @ =0x00004014
ldrh r1, [r4]
subs r1, #0x80
ldrb r2, [r5]
bl UpdateCollisionLayer
bl SetTile
_08090B60:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -737,7 +737,7 @@ _08090BBE:
adds r1, r6, r4
ldr r0, _08090BE4 @ =0x00004022
adds r2, r7, #0
bl UpdateCollisionLayer
bl SetTile
adds r4, #1
cmp r4, r5
ble _08090BBE
@@ -770,7 +770,7 @@ _08090C00:
adds r1, r6, r4
ldr r0, _08090C2C @ =0x00004022
adds r2, r7, #0
bl UpdateCollisionLayer
bl SetTile
adds r4, #1
cmp r4, r5
ble _08090C00
@@ -796,7 +796,7 @@ _08090C34:
ldr r0, _08090C44 @ =0x00004022
subs r1, r6, r4
adds r2, r7, #0
bl UpdateCollisionLayer
bl SetTile
b _08090CB2
.align 2, 0
_08090C44: .4byte 0x00004022
@@ -809,7 +809,7 @@ _08090C50:
adds r1, r6, r4
ldr r0, _08090C78 @ =0x00004022
adds r2, r7, #0
bl UpdateCollisionLayer
bl SetTile
adds r4, #1
cmp r4, r5
blt _08090C50
@@ -824,7 +824,7 @@ _08090C6A:
adds r1, r6, r4
_08090C6E:
adds r2, r7, #0
bl UpdateCollisionLayer
bl SetTile
b _08090CD2
.align 2, 0
_08090C78: .4byte 0x00004022
@@ -846,7 +846,7 @@ _08090C98:
adds r1, r6, r4
ldr r0, _08090CC0 @ =0x00004022
adds r2, r7, #0
bl UpdateCollisionLayer
bl SetTile
adds r4, #1
cmp r4, r5
ble _08090C98
@@ -896,7 +896,7 @@ sub_08090CDC: @ 0x08090CDC
adds r0, r4, #0
adds r1, r5, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
b _08090DB2
_08090D06:
ldr r1, _08090D18 @ =0xFFFFBFDE
@@ -975,7 +975,7 @@ _08090DA8:
adds r0, r2, #0
adds r1, r5, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
_08090DB2:
pop {r4, r5, r6, pc}
.align 2, 0
asm/gentariCurtains.s
+4 -4
View File
@@ -117,11 +117,11 @@ _0809207A:
ldrh r1, [r5]
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r7]
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
movs r1, #0
bl LoadAnimation
@@ -176,7 +176,7 @@ sub_08092164: @ 0x08092164
adds r1, #0x70
ldrh r1, [r1]
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r0, r4, #0
adds r0, #0x76
ldrh r0, [r0]
@@ -184,7 +184,7 @@ sub_08092164: @ 0x08092164
adds r1, #0x72
ldrh r1, [r1]
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r0, r4, #0
bl sub_08092214
adds r0, r4, #0
asm/getEmptyEntity.s
+1 -1
View File
@@ -98,7 +98,7 @@ _0805E718:
cmp r5, #0
beq _0805E72E
adds r0, r5, #0
bl sub_0805E7BC
bl DeleteEntity
adds r0, r5, #0
bl sub_0805E870
_0805E72E:
asm/giantBookLadder.s
+13 -13
View File
@@ -128,22 +128,22 @@ _0808E57A:
ldrb r2, [r5]
adds r0, r4, #0
adds r1, r7, #0
bl UpdateCollisionLayer
bl SetTile
ldr r2, _0808E604 @ =0xFFFFFF00
adds r1, r6, r2
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0808E608 @ =0x0000406C
ldr r2, _0808E60C @ =0xFFFFFEFE
adds r1, r6, r2
ldrb r2, [r5]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0808E610 @ =0x0000406D
adds r1, r6, #0
subs r1, #0xff
ldrb r2, [r5]
bl UpdateCollisionLayer
bl SetTile
mov r1, r8
ldrb r0, [r1, #0xa]
movs r2, #6
@@ -157,22 +157,22 @@ _0808E57A:
adds r1, #0x3f
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
adds r1, #0x40
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
adds r1, #0x7f
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r6, #0
adds r1, #0x80
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
b _0808E63A
.align 2, 0
_0808E5FC: .4byte 0xFFFFFEFF
@@ -192,11 +192,11 @@ _0808E614:
ldrb r2, [r4]
adds r0, r5, #0
adds r1, r7, #0
bl UpdateCollisionLayer
bl SetTile
ldrb r2, [r4]
adds r0, r5, #0
adds r1, r6, #0
bl UpdateCollisionLayer
bl SetTile
movs r1, #2
mov sb, r1
_0808E63A:
@@ -211,11 +211,11 @@ _0808E646:
ldrb r2, [r4]
adds r0, r6, #0
adds r1, r7, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r7, #1
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r5, #1
cmp r5, sb
blo _0808E646
@@ -235,7 +235,7 @@ sub_0808E670: @ 0x0808E670
ldr r1, _0808E684 @ =0xFFFFFEFF
adds r0, r0, r1
movs r1, #1
bl sub_080002B0
bl GetTileType
pop {pc}
.align 2, 0
_0808E684: .4byte 0xFFFFFEFF
asm/giantLeaf.s
+1 -1
View File
@@ -74,7 +74,7 @@ _0808D64A:
adds r1, r5, r1
ldr r0, _0808D670 @ =0x00004074
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r4, #2
adds r6, #1
cmp r6, #0xc
asm/giantTwig.s
+45 -45
View File
@@ -326,7 +326,7 @@ _0809399A:
adds r1, r1, r0
ldr r0, _080939BC @ =0x00004074
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r4, #2
adds r5, #1
cmp r5, #0x12
@@ -416,71 +416,71 @@ _08093A3C:
adds r4, r2, #0
adds r4, #0x38
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldr r5, _08093AF4 @ =0x00004022
ldrh r1, [r7]
adds r1, #0x3d
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r7]
adds r1, #0x3e
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093AF8 @ =0x00004029
mov r8, r0
ldrh r1, [r7]
adds r1, #0x7c
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldr r6, _08093AFC @ =0x00004026
ldrh r1, [r7]
adds r1, #0x7d
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r7]
adds r1, #0x7e
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r5, #0x1b
ldrh r1, [r7]
adds r1, #0x40
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r7]
adds r1, #0x80
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093B00 @ =0x00004027
ldrh r1, [r7]
adds r1, #0x41
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093B04 @ =0x00004023
ldrh r1, [r7]
adds r1, #0x42
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093B08 @ =0x0000406D
ldrh r1, [r7]
adds r1, #0x43
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r7]
adds r1, #0x81
ldrb r2, [r4]
mov r0, r8
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r7]
adds r1, #0x82
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r7]
adds r1, #0x83
b _08093B94
@@ -507,56 +507,56 @@ _08093B0C:
adds r4, #0x38
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
ldr r5, _08093BA4 @ =0x00004022
mov r2, r8
ldrh r1, [r2]
subs r1, #0x41
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093BA8 @ =0x00004029
mov r2, r8
ldrh r1, [r2]
subs r1, #2
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093BAC @ =0x00004026
mov r2, r8
ldrh r1, [r2]
subs r1, #1
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
mov r0, r8
ldrh r1, [r0]
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
mov r2, r8
ldrh r1, [r2]
adds r1, #1
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093BB0 @ =0x0000406E
mov r2, r8
ldrh r1, [r2]
adds r1, #0x40
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
mov r0, r8
ldrh r1, [r0]
adds r1, #0x41
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
mov r2, r8
ldrh r1, [r2]
adds r1, #0x42
_08093B94:
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
b _08093C64
.align 2, 0
_08093BA0: .4byte 0x0000406D
@@ -575,55 +575,55 @@ _08093BB4:
adds r4, #0x38
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
ldr r5, _08093C44 @ =0x00004022
mov r2, r8
ldrh r1, [r2]
subs r1, #0x3f
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
mov r0, r8
ldrh r1, [r0]
subs r1, #1
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
mov r2, r8
ldrh r1, [r2]
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093C48 @ =0x00004026
mov r2, r8
ldrh r1, [r2]
adds r1, #1
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093C4C @ =0x0000402A
mov r2, r8
ldrh r1, [r2]
adds r1, #2
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
mov r0, r8
ldrh r1, [r0]
adds r1, #0x3e
ldrb r2, [r4]
adds r0, r6, #0
bl UpdateCollisionLayer
bl SetTile
mov r2, r8
ldrh r1, [r2]
adds r1, #0x3f
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093C50 @ =0x0000406F
mov r2, r8
ldrh r1, [r2]
adds r1, #0x40
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
b _08093C64
.align 2, 0
_08093C40: .4byte 0x0000406C
@@ -638,7 +638,7 @@ _08093C54:
ldrh r1, [r1]
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_08093C64:
pop {r3}
mov r8, r3
@@ -670,33 +670,33 @@ sub_08093C70: @ 0x08093C70
adds r5, #0x38
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
adds r1, #0x40
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
adds r1, #0x41
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
adds r4, #4
ldrh r1, [r6]
adds r1, #0x7f
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
adds r1, #0x80
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
adds r1, #0x81
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
b _08093D5C
.align 2, 0
_08093CE0: .4byte gLinkState
@@ -728,32 +728,32 @@ _08093CE8:
adds r4, #0x38
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
adds r1, #0x40
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093D68 @ =0x00004027
ldrh r1, [r6]
adds r1, #0x41
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
adds r1, #0x7f
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
adds r1, #0x80
ldrb r2, [r4]
adds r0, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08093D6C @ =0x00004029
ldrh r1, [r6]
adds r1, #0x81
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
_08093D5C:
pop {r4, r5, r6, pc}
.align 2, 0
asm/gibdo.s
+1 -1
View File
@@ -415,7 +415,7 @@ sub_0803775C: @ 0x0803775C
bl sub_08037C0C
_0803778A:
adds r0, r5, #0
bl sub_0805E7BC
bl DeleteEntity
_08037790:
pop {r4, r5, pc}
.align 2, 0
asm/gleerok.s
+1 -1
View File
@@ -418,7 +418,7 @@ sub_0802D33C: @ 0x0802D33C
adds r5, r7, #0
_0802D34A:
ldm r5!, {r0}
bl sub_0805E7BC
bl DeleteEntity
adds r4, #1
cmp r4, #3
bls _0802D34A
asm/greatFairy.s
+1 -1
View File
@@ -153,7 +153,7 @@ sub_080873FC: @ 0x080873FC
.align 2, 0
_0808740C: .4byte gRoomControls
_08087410:
bl sub_0805E7BC
bl DeleteEntity
_08087414:
movs r0, #6
movs r1, #0x1b
asm/guardWithSpear.s
+1 -1
View File
@@ -626,7 +626,7 @@ sub_08064180: @ 0x08064180
bl sub_0805EB00
cmp r0, #0
beq _08064194
bl sub_0805E7BC
bl DeleteEntity
_08064194:
pop {pc}
.align 2, 0
asm/helmasaur.s
+2 -2
View File
@@ -628,7 +628,7 @@ sub_0802BFE0: @ 0x0802BFE0
cmp r0, #0
beq _0802BFF2
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_0802BFF2:
pop {r4, pc}
@@ -652,7 +652,7 @@ sub_0802BFF4: @ 0x0802BFF4
cmp r0, #0
bne _0802C01C
adds r0, r3, #0
bl sub_0805E7BC
bl DeleteEntity
_0802C01C:
pop {pc}
.align 2, 0
asm/hiddenLadderDown.s
+10 -10
View File
@@ -81,50 +81,50 @@ sub_08091F14: @ 0x08091F14
subs r1, #0x41
adds r4, #0x38
ldrb r2, [r4]
bl sub_0807B314
bl SetTileType
ldr r0, _08091FF0 @ =0x000001A3
ldrh r1, [r5]
subs r1, #0x40
ldrb r2, [r4]
bl sub_0807B314
bl SetTileType
movs r0, #0xd2
lsls r0, r0, #1
ldrh r1, [r5]
subs r1, #0x3f
ldrb r2, [r4]
bl sub_0807B314
bl SetTileType
ldr r0, _08091FF4 @ =0x000001A5
ldrh r1, [r5]
subs r1, #1
ldrb r2, [r4]
bl sub_0807B314
bl SetTileType
movs r0, #0xd3
lsls r0, r0, #1
ldrh r1, [r5]
ldrb r2, [r4]
bl sub_0807B314
bl SetTileType
ldr r0, _08091FF8 @ =0x000001A7
ldrh r1, [r5]
adds r1, #1
ldrb r2, [r4]
bl sub_0807B314
bl SetTileType
movs r0, #0xd4
lsls r0, r0, #1
ldrh r1, [r5]
adds r1, #0x3f
ldrb r2, [r4]
bl sub_0807B314
bl SetTileType
ldr r0, _08091FFC @ =0x000001A9
ldrh r1, [r5]
adds r1, #0x40
ldrb r2, [r4]
bl sub_0807B314
bl SetTileType
movs r0, #0xd5
lsls r0, r0, #1
ldrh r1, [r5]
adds r1, #0x41
ldrb r2, [r4]
bl sub_0807B314
bl SetTileType
_08091FEA:
pop {r4, r5, pc}
.align 2, 0
@@ -143,7 +143,7 @@ sub_08092000: @ 0x08092000
adds r1, r4, #0
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002B0
bl GetTileType
movs r1, #0xd3
lsls r1, r1, #1
cmp r0, r1
asm/houseDoorExterior.s
+2 -2
View File
@@ -251,7 +251,7 @@ _0808688C:
adds r4, #0x84
ldr r1, [r4]
adds r0, r5, #0
bl sub_0807DF74
bl ExecuteScriptCommandSet
ldr r1, [r4]
adds r0, r5, #0
bl sub_080868EC
@@ -284,7 +284,7 @@ _080868D2:
adds r4, #0x84
ldr r1, [r4]
adds r0, r5, #0
bl sub_0807DF74
bl ExecuteScriptCommandSet
ldr r1, [r4]
adds r0, r5, #0
bl sub_080868EC
asm/intr.s
+4 -4
View File
@@ -94,8 +94,8 @@ _080B1A34:
add r0, r0, r1, lsl #6
mov r1, r2
arm_func_start sub_080B1A60
sub_080B1A60: @ 0x080B1A60
arm_func_start _GetTileType
_GetTileType: @ 0x080B1A60
ldr r2, _080B1C1C @ =gUnk_08000228
_080B1A64:
add r2, r2, r1, lsl #3
@@ -190,7 +190,7 @@ sub_080B1B68: @ 0x080B1B68
arm_func_start sub_080B1B84
sub_080B1B84: @ 0x080B1B84
mov ip, lr
bl sub_080B1A60
bl _GetTileType
lsls r0, r0, #0x12
ldrlo r1, _080B1C3C @ =gUnk_08000360
ldrhs r1, _080B1C40 @ =gUnk_080B7A3E
@@ -202,7 +202,7 @@ sub_080B1B84: @ 0x080B1B84
sub_080B1BA4: @ 0x080B1BA4
mov ip, lr
mov r3, r2
bl sub_080B1A60
bl _GetTileType
lsls r0, r0, #0x12
ldrlo r1, _080B1C44 @ =gUnk_08000360
ldrhs r1, _080B1C48 @ =gUnk_080B7A3E
asm/itemOnGround.s
+6 -6
View File
@@ -981,7 +981,7 @@ sub_080811AC: @ 0x080811AC
ands r0, r1
strb r0, [r4, #0x18]
adds r0, r4, #0
bl sub_080002A0
bl GetTileTypeByEntity
adds r4, #0x6e
strh r0, [r4]
pop {r4, pc}
@@ -1124,7 +1124,7 @@ sub_080812A8: @ 0x080812A8
adds r0, #0x6e
ldrh r4, [r0]
adds r0, r5, #0
bl sub_080002A0
bl GetTileTypeByEntity
cmp r4, r0
beq _080812E4
movs r0, #0
@@ -1322,12 +1322,12 @@ _08081418:
sub_08081420: @ 0x08081420
push {r4, lr}
adds r4, r0, #0
bl sub_08081450
bl CheckShouldPlayItemGetCutscene
cmp r0, #0
bne _08081438
ldrb r0, [r4, #0xa]
ldrb r1, [r4, #0xb]
bl sub_08053FF0
bl GiveItem
movs r0, #0
b _0808144C
_08081438:
@@ -1343,8 +1343,8 @@ _0808144C:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08081450
sub_08081450: @ 0x08081450
thumb_func_start CheckShouldPlayItemGetCutscene
CheckShouldPlayItemGetCutscene: @ 0x08081450
push {r4, lr}
movs r4, #0
ldr r1, _08081478 @ =gUnk_080FD5B4
asm/jarPortal.s
+4 -4
View File
@@ -405,21 +405,21 @@ sub_0808C148: @ 0x0808C148
adds r4, r6, #0
adds r4, #0x38
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0808C1AC @ =0x00004093
ldrb r2, [r4]
adds r1, r5, #0
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0808C1B0 @ =0x00004094
adds r1, r5, #0
adds r1, #0x3f
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0808C1B4 @ =0x00004095
adds r1, r5, #0
adds r1, #0x40
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
b _0808C1E0
.align 2, 0
_0808C1A4: .4byte gRoomControls
asm/kid.s
+6 -6
View File
@@ -912,27 +912,27 @@ sub_08062788: @ 0x08062788
ldr r1, _080627D0 @ =0x0000060B
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _080627D4 @ =0x0000060C
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _080627D8 @ =0x0000060D
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _080627DC @ =0x0000064B
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _080627E0 @ =0x0000064C
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r1, _080627E4 @ =0x0000064D
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
pop {r4, pc}
.align 2, 0
_080627CC: .4byte 0x00004072
asm/ladderUp.s
+7 -7
View File
@@ -78,7 +78,7 @@ _0808DBA2:
adds r2, r7, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
b _0808DD72
.align 2, 0
_0808DBDC: .4byte 0x0000FF80
@@ -150,7 +150,7 @@ _0808DC4E:
b _0808DD72
_0808DC66:
adds r0, r7, #0
bl sub_080002A0
bl GetTileTypeByEntity
ldr r1, _0808DCD0 @ =0x00004017
cmp r0, r1
beq _0808DC74
@@ -176,7 +176,7 @@ _0808DC74:
adds r6, r7, #0
adds r6, #0x38
ldrb r2, [r6]
bl UpdateCollisionLayer
bl SetTile
movs r1, #0x2e
ldrsh r0, [r7, r1]
ldrh r1, [r4, #6]
@@ -203,7 +203,7 @@ _0808DCD4: .4byte 0x00004023
_0808DCD8: .4byte gRoomControls
_0808DCDC:
adds r0, r7, #0
bl sub_080002A0
bl GetTileTypeByEntity
ldr r3, _0808DD44 @ =0x00004017
mov r8, r3
cmp r0, r8
@@ -228,7 +228,7 @@ _0808DCDC:
adds r4, #0x38
ldrb r2, [r4]
mov r0, r8
bl UpdateCollisionLayer
bl SetTile
ldrb r0, [r7, #0xa]
cmp r0, #0
bne _0808DD4C
@@ -249,7 +249,7 @@ _0808DCDC:
orrs r1, r0
ldrb r2, [r4]
mov r0, r8
bl UpdateCollisionLayer
bl SetTile
b _0808DD72
.align 2, 0
_0808DD44: .4byte 0x00004017
@@ -272,7 +272,7 @@ _0808DD4C:
lsls r2, r2, #6
orrs r1, r2
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
_0808DD72:
pop {r3}
mov r8, r3
asm/lakitu.s
+1 -1
View File
@@ -742,7 +742,7 @@ _0803CCAA:
movs r0, #0
str r0, [r4, #0x54]
adds r0, r5, #0
bl sub_0805E7BC
bl DeleteEntity
_0803CCB4:
pop {r4, r5, pc}
.align 2, 0
asm/lightableSwitch.s
+1 -1
View File
@@ -159,7 +159,7 @@ _0809EAF8:
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
_0809EB24:
pop {r4, r5, r6, pc}
.align 2, 0
asm/lilypadLarge.s
+1 -1
View File
@@ -1315,7 +1315,7 @@ _08085EBE:
ldr r0, [r1, #0x2c]
cmp r0, #0
beq _08085EE8
bl sub_0805E7BC
bl DeleteEntity
_08085EE8:
bl sub_08077B2C
pop {pc}
asm/lockedDoor.s
+3 -3
View File
@@ -230,7 +230,7 @@ sub_080834B4: @ 0x080834B4
ldrh r1, [r1]
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _080834E8 @ =0x0000010B
bl sub_08004488
_080834E6:
@@ -502,7 +502,7 @@ sub_080836A0: @ 0x080836A0
ldrh r1, [r1]
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
pop {pc}
.align 2, 0
_080836D8: .4byte 0x00004022
@@ -517,7 +517,7 @@ sub_080836DC: @ 0x080836DC
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
movs r0, #7
strb r0, [r5, #0xe]
ldrb r1, [r5, #0x18]
asm/macroAcorn.s
+28 -28
View File
@@ -173,70 +173,70 @@ _0809E636:
adds r1, r5, #0
subs r1, #0x3d
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809E6E0 @ =0x0000406D
adds r1, r5, #0
subs r1, #0x3c
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_0809E64E:
ldr r0, _0809E6E4 @ =0x0000406C
adds r1, r5, #0
subs r1, #0x42
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r4, _0809E6DC @ =0x00004022
adds r1, r5, #0
subs r1, #0x41
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r5, #0
subs r1, #0x40
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r5, #0
subs r1, #0x3f
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
subs r1, r5, #2
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
subs r1, r5, #1
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r0, r4, #0
adds r1, r5, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r5, #1
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809E6E8 @ =0x0000406E
adds r1, r5, #0
adds r1, #0x3e
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r5, #0
adds r1, #0x3f
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r5, #0
adds r1, #0x40
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809E6EC @ =0x0000406F
adds r1, r5, #0
adds r1, #0x41
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
b _0809E792
.align 2, 0
_0809E6DC: .4byte 0x00004022
@@ -249,70 +249,70 @@ _0809E6F0:
adds r1, r5, #0
subs r1, #0x44
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809E798 @ =0x0000406C
adds r1, r5, #0
subs r1, #0x45
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_0809E708:
ldr r4, _0809E794 @ =0x00004022
adds r1, r5, #0
subs r1, #0x42
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r5, #0
subs r1, #0x41
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r5, #0
subs r1, #0x40
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809E79C @ =0x0000406D
adds r1, r5, #0
subs r1, #0x3f
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
subs r1, r5, #2
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
subs r1, r5, #1
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r0, r4, #0
adds r1, r5, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r5, #1
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809E7A0 @ =0x0000406E
adds r1, r5, #0
adds r1, #0x3e
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r5, #0
adds r1, #0x3f
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r1, r5, #0
adds r1, #0x40
adds r0, r4, #0
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, _0809E7A4 @ =0x0000406F
adds r1, r5, #0
adds r1, #0x41
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_0809E792:
pop {r4, r5, pc}
.align 2, 0
asm/macroBook.s
+1 -1
View File
@@ -302,7 +302,7 @@ _0809A9A0:
ldrh r0, [r6]
adds r1, r5, r4
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_0809A9B4:
adds r4, #1
adds r6, #2
asm/macroDecorations.s
+1 -1
View File
@@ -162,7 +162,7 @@ _08097EE8:
ldrsh r1, [r4, r2]
adds r1, r5, r1
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r4, #4
movs r1, #0
ldrsh r0, [r4, r1]
asm/macroLink.s
+1 -1
View File
@@ -393,7 +393,7 @@ _0808CDB8:
ldr r0, _0808CDD8 @ =0x00000C04
strh r0, [r1]
ldr r0, [r4, #0x54]
bl sub_0805E7BC
bl DeleteEntity
adds r0, r4, #0
bl sub_0805EC60
_0808CDD6:
asm/macroShoes.s
+3 -3
View File
@@ -42,15 +42,15 @@ sub_080984EC: @ 0x080984EC
movs r1, #0x82
lsls r1, r1, #3
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08098530 @ =0x00004026
ldr r1, _08098534 @ =0x00000411
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08098538 @ =0x00004025
ldr r1, _0809853C @ =0x00000412
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
_08098524:
pop {pc}
.align 2, 0
asm/madderpillar.s
+2 -2
View File
@@ -363,7 +363,7 @@ sub_08029B2C: @ 0x08029B2C
movs r2, #0
bl CreateFx
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _08029B8A
_08029B60:
ldrb r1, [r4, #0x10]
@@ -548,7 +548,7 @@ sub_08029C98: @ 0x08029C98
movs r2, #0
bl CreateFx
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _08029CC6
_08029CB6:
ldr r0, _08029CC8 @ =gUnk_080CCDA8
asm/mask.s
+2 -2
View File
@@ -131,7 +131,7 @@ _08092A08:
ldr r0, _08092A90 @ =0x00004022
ldrh r1, [r4]
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_08092A8C: .4byte gRoomControls
@@ -172,7 +172,7 @@ sub_08092A94: @ 0x08092A94
adds r5, #0x7e
ldrh r1, [r5]
movs r2, #1
bl UpdateCollisionLayer
bl SetTile
adds r0, r4, #0
adds r0, #0x7a
ldrh r0, [r0]
asm/mazaalHead.s
+3 -3
View File
@@ -1609,7 +1609,7 @@ sub_08034A84: @ 0x08034A84
cmp r0, #0
bne _08034A98
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _08034AC2
_08034A98:
ldrb r0, [r4, #0xc]
@@ -1772,7 +1772,7 @@ sub_08034BA0: @ 0x08034BA0
movs r1, #0xff
strh r1, [r0]
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_08034BC4:
pop {r4, pc}
.align 2, 0
@@ -1828,7 +1828,7 @@ sub_08034C00: @ 0x08034C00
adds r1, #0xd
movs r2, #3
movs r3, #3
bl sub_0800293E
bl CheckPlayerInRegion
cmp r0, #0
beq _08034C5A
ldr r0, _08034C4C @ =gUnk_030010A0
asm/mazaalMacro.s
+2 -2
View File
@@ -111,7 +111,7 @@ sub_08034CC4: @ 0x08034CC4
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
movs r0, #0x37
movs r1, #2
bl CreateEnemy
@@ -402,7 +402,7 @@ sub_08034F58: @ 0x08034F58
ldr r0, _08034F6C @ =gUnk_0813ABA8
bl sub_08080840
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
pop {r4, pc}
.align 2, 0
_08034F6C: .4byte gUnk_0813ABA8
asm/metalDoor.s
+6 -6
View File
@@ -256,16 +256,16 @@ sub_080A080C: @ 0x080A080C
subs r1, #1
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
ldrh r1, [r6]
adds r1, #1
ldrb r2, [r5]
adds r0, r4, #0
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_080A086C: .4byte 0x00004022
@@ -283,19 +283,19 @@ sub_080A0870: @ 0x080A0870
adds r4, r6, #0
adds r4, #0x38
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
adds r0, #0x78
ldrh r0, [r0]
ldrh r1, [r5]
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
adds r0, r6, #0
adds r0, #0x7a
ldrh r0, [r0]
ldrh r1, [r5]
adds r1, #1
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
asm/minecart.s
+2 -2
View File
@@ -134,7 +134,7 @@ _0809171A:
adds r2, r6, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080917C8: .4byte gUnk_030010EC
@@ -827,7 +827,7 @@ sub_08091CC8: @ 0x08091CC8
adds r2, r6, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
b _08091D8A
.align 2, 0
_08091D58: .4byte gLinkState
asm/minecartDoor.s
+2 -2
View File
@@ -119,7 +119,7 @@ _08096B9C:
ldr r0, _08096BB8 @ =0x00004022
ldrh r1, [r5]
ldrb r2, [r6]
bl UpdateCollisionLayer
bl SetTile
_08096BB6:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -148,7 +148,7 @@ sub_08096BBC: @ 0x08096BBC
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl UpdateCollisionLayer
bl SetTile
ldr r0, _08096BF4 @ =0x0000010B
bl sub_08004488
_08096BF2:
asm/moldorm.s
+1 -1
View File
@@ -313,7 +313,7 @@ sub_08022D90: @ 0x08022D90
_08022DDC: .4byte gUnk_080CBBBC
_08022DE0:
adds r0, r5, #0
bl sub_0805E7BC
bl DeleteEntity
_08022DE6:
pop {r4, r5, pc}
asm/moldworm.s
+3 -3
View File
@@ -50,7 +50,7 @@ _08023080:
b _08023090
_08023088:
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
b _080230CA
_08023090:
ldr r0, [r4, #0x50]
@@ -367,7 +367,7 @@ _080232C2:
ldrb r2, [r0]
adds r0, r6, #0
adds r1, r5, #0
bl sub_080002A4
bl GetTileTypeByPos
bl sub_08023A38
cmp r0, #0
beq _08023314
@@ -479,7 +479,7 @@ _080233C0:
cmp r0, #0
bne _08023416
adds r0, r5, #0
bl sub_080002A0
bl GetTileTypeByEntity
bl sub_08023A38
cmp r0, #0
beq _08023412
asm/object10.s
+3 -3
View File
@@ -79,7 +79,7 @@ sub_0808483C: @ 0x0808483C
ldrh r1, [r5]
adds r4, #0x38
ldrb r2, [r4]
bl UpdateCollisionLayer
bl SetTile
movs r0, #0x89
lsls r0, r0, #1
bl PlaySFX
@@ -375,7 +375,7 @@ _08084AF8:
movs r2, #0
bl CreateFx
ldr r0, [r4, #0x54]
bl sub_0805E7BC
bl DeleteEntity
ldr r0, _08084B18 @ =0x0000018F
bl PlaySFX
bl sub_0805E780
@@ -624,7 +624,7 @@ sub_08084CAC: @ 0x08084CAC
adds r1, r5, #0
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002B0
bl GetTileType
bl sub_080002E4
cmp r0, #0x72
bne _08084D24
asm/object11.s
+1 -1
View File
@@ -133,7 +133,7 @@ _08084D7E:
lsls r2, r2, #6
orrs r1, r2
ldrb r2, [r6]
bl UpdateCollisionLayer
bl SetTile
ldrb r0, [r7, #0xa]
lsls r0, r0, #2
add r0, r8
asm/object12.s
+10 -10
View File
@@ -172,7 +172,7 @@ sub_080850CC: @ 0x080850CC
ands r0, r1
strh r0, [r2]
adds r0, r4, #0
bl sub_0805E7BC
bl DeleteEntity
_080850F0:
pop {r4, pc}
.align 2, 0
@@ -205,44 +205,44 @@ sub_080850FC: @ 0x080850FC
subs r1, #0x41
adds r0, r5, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r4, #0
subs r1, #0x40
adds r0, r5, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r4, #0
subs r1, #0x3f
adds r0, r5, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
subs r1, r4, #1
adds r0, r5, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r0, r5, #0
adds r1, r4, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r4, #1
adds r0, r5, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r4, #0
adds r1, #0x3f
adds r0, r5, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r1, r4, #0
adds r1, #0x40
adds r0, r5, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
adds r4, #0x41
adds r0, r5, #0
adds r1, r4, #0
adds r2, r6, #0
bl UpdateCollisionLayer
bl SetTile
pop {r4, r5, r6, pc}
.align 2, 0
_0808518C: .4byte gRoomControls

Some files were not shown because too many files have changed in this diff Show More