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

updated symbols

This commit is contained in:
theo 2020-06-07 21:34:18 -07:00
parent d30f9ffe05
commit e4ee89d5a6
92 changed files with 47920 additions and 48014 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/anju.s
View File

@ -72,7 +72,7 @@ _0806C338:
b _0806C350
_0806C342:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806C350
movs r0, #1

2
asm/bigGoron.s
View File

@ -1030,7 +1030,7 @@ _0806D690:
ldrsb r1, [r4, r1]
adds r0, r5, #0
movs r2, #0x40
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _0806D6C0

4
asm/bladeBrothers.s
View File

@ -240,7 +240,7 @@ _08068B6C:
sub_08068B70: @ 0x08068B70
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08068B80
movs r0, #1
@ -311,7 +311,7 @@ sub_08068BEC: @ 0x08068BEC
adds r4, r0, #0
movs r1, #0x44
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _08068C22

2
asm/bowUse.s
View File

@ -80,7 +80,7 @@ _080191F0:
adds r0, r4, #0
movs r1, #0x14
movs r2, #0
bl CreateFX
bl CreateFx
_0801920E:
ldrb r0, [r4, #0xb]
cmp r0, #0

2
asm/brocco.s
View File

@ -216,7 +216,7 @@ _080636A4:
b _080636D4
_080636BA:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _080636D4
movs r0, #1

2
asm/carpenter.s
View File

@ -92,7 +92,7 @@ _080671F4:
b _08067224
_0806720A:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08067224
movs r0, #1

57
asm/cartOfLonLonMilk.s
View File

@ -1,57 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08065B4C
sub_08065B4C: @ 0x08065B4C
push {r4, lr}
adds r4, r0, #0
ldr r1, _08065B68 @ =gUnk_08110118
ldrb r0, [r4, #0xc]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
adds r0, r4, #0
bl sub_0806ED78
pop {r4, pc}
.align 2, 0
_08065B68: .4byte gUnk_08110118
thumb_func_start sub_08065B6C
sub_08065B6C: @ 0x08065B6C
push {lr}
ldrb r1, [r0, #0xc]
adds r1, #1
strb r1, [r0, #0xc]
ldrb r2, [r0, #0x18]
movs r1, #4
rsbs r1, r1, #0
ands r1, r2
movs r2, #1
orrs r1, r2
strb r1, [r0, #0x18]
ldr r2, _08065B98 @ =0xFFFF8000
adds r1, r2, #0
ldrh r2, [r0, #0x30]
adds r1, r1, r2
strh r1, [r0, #0x30]
movs r1, #6
strb r1, [r0, #0x14]
movs r1, #3
bl LoadAnimation
pop {pc}
.align 2, 0
_08065B98: .4byte 0xFFFF8000
thumb_func_start sub_08065B9C
sub_08065B9C: @ 0x08065B9C
push {lr}
bl sub_080042B8
pop {pc}

22
asm/castorWildsStatue.s
View File

@ -133,21 +133,21 @@ sub_08067418: @ 0x08067418
adds r4, #0x38
ldrb r2, [r4]
adds r0, r5, #0
bl sub_0800015E
bl UpdateCollisionLayer
ldrh r1, [r7]
ldrb r2, [r4]
adds r0, r5, #0
bl sub_0800015E
bl UpdateCollisionLayer
ldrh r1, [r7]
adds r1, #0x3f
ldrb r2, [r4]
adds r0, r5, #0
bl sub_0800015E
bl UpdateCollisionLayer
ldrh r1, [r7]
adds r1, #0x40
ldrb r2, [r4]
adds r0, r5, #0
bl sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
ldr r1, _08067508 @ =0x00000E82
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0806750C @ =0x00000E83
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _08067510 @ =0x00000EC3
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
_080674F8:
adds r0, r6, #0
bl sub_0807DD50
@ -239,7 +239,7 @@ _0806753A:
adds r0, r5, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08067560
@ -326,7 +326,7 @@ _080675EC:
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r3, r0, #0
cmp r3, #0
beq _08067646
@ -379,7 +379,7 @@ _08067656:
adds r0, r4, #0
movs r1, #4
movs r2, #0
bl CreateFX
bl CreateFx
adds r3, r0, #0
cmp r3, #0
beq _080676B0

2
asm/cat.s
View File

@ -396,7 +396,7 @@ _08067A94:
sub_08067A98: @ 0x08067A98
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08067AAA
adds r0, r4, #0

12
asm/clothesRack.s
View File

@ -76,7 +76,7 @@ _0806DDC4:
mov r0, sb
ldrb r2, [r0]
mov r0, sl
bl sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
pop {r3, r4, r5}
mov r8, r3
mov sb, r4

4
asm/code_08000108.s
View File

@ -54,8 +54,8 @@ sub_08000152: @ 0x08000152
ldrh r0, [r3, r0]
lsrs r2, r2, #2
non_word_aligned_thumb_func_start sub_0800015E
sub_0800015E: @ 0x0800015E
non_word_aligned_thumb_func_start UpdateCollisionLayer
UpdateCollisionLayer: @ 0x0800015E
push {r4, r5, r6, r7, lr}
lsls r3, r2, #3
ldr r4, _08000208 @ =gUnk_08000228

6
asm/code_08016DF8.s
View File

@ -506,7 +506,7 @@ _080171D6:
adds r1, #0x55
adds r0, r5, #0
movs r2, #0
bl CreateFX
bl CreateFx
_080171EA:
pop {r4, r5}
pop {r0}
@ -1506,7 +1506,7 @@ sub_08017940: @ 0x08017940
adds r0, r4, #0
movs r1, #0x2c
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _080179CC
@ -1600,7 +1600,7 @@ sub_080179EC: @ 0x080179EC
ldrb r1, [r1]
adds r0, r5, #0
movs r2, #0
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _08017A84

16
asm/code_08019444.s
View File

@ -35,7 +35,7 @@ sub_08019468: @ 0x08019468
adds r0, r1, #0
movs r1, #0x50
movs r2, #0
bl CreateFX
bl CreateFx
_0801947E:
pop {pc}
@ -228,7 +228,7 @@ _080195B0:
adds r0, r4, #0
movs r1, #0x19
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_08019602:
adds r0, r4, #0
@ -239,7 +239,7 @@ _08019602:
adds r0, r4, #0
movs r1, #0x19
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_0801961A:
adds r0, r4, #0
@ -1814,7 +1814,7 @@ _0801A1D4:
adds r1, #0x38
ldrb r2, [r1]
adds r1, r7, #0
bl sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
movs r0, #4
b _0801A2A6
.align 2, 0
@ -3549,7 +3549,7 @@ _0801AF2E:
ldrsh r1, [r4, r2]
adds r1, r6, r1
adds r2, r5, #0
bl sub_0800015E
bl UpdateCollisionLayer
adds r4, #4
movs r1, #0
ldrsh r0, [r4, r1]
@ -3686,7 +3686,7 @@ _0801B026:
lsls r1, r7, #6
adds r1, r1, r2
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
_0801B03E:
adds r3, r4, #0
adds r2, r5, #0

18
asm/code_0801D79C.s
View File

@ -6946,7 +6946,7 @@ sub_08020AD0: @ 0x08020AD0
ldr r0, _08020B64 @ =0x00004034
ldrb r2, [r6]
adds r1, r5, #0
bl sub_0800015E
bl UpdateCollisionLayer
movs r0, #1
b _08020B6A
.align 2, 0
@ -8549,7 +8549,7 @@ sub_080216FC: @ 0x080216FC
adds r0, r2, #0
movs r1, #3
movs r2, #0x80
bl CreateFX
bl CreateFx
bl sub_0805E780
_0802171A:
pop {pc}
@ -9769,11 +9769,11 @@ sub_08022004: @ 0x08022004
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r4, #0
movs r1, #5
movs r2, #0
bl CreateFX
bl CreateFx
adds r0, r4, #0
bl sub_08049CF4
bl sub_0805E780
@ -9912,7 +9912,7 @@ _08022124:
adds r0, r5, #0
movs r1, #0x11
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08022148
@ -10037,7 +10037,7 @@ sub_080221C0: @ 0x080221C0
ldrh r0, [r0]
ldrb r2, [r5]
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, r5, r6, pc}
.align 2, 0
_08022220: .4byte gRoomControls
@ -10127,7 +10127,7 @@ _080222F2:
adds r0, r4, #0
movs r1, #4
movs r2, #0
bl CreateFX
bl CreateFx
movs r0, #1
movs r1, #1
bl CreateEnemy
@ -12327,7 +12327,7 @@ sub_08023330: @ 0x08023330
adds r0, r5, #0
movs r1, #4
movs r2, #0
bl CreateFX
bl CreateFx
_08023394:
pop {r4, r5, pc}
.align 2, 0
@ -12389,7 +12389,7 @@ _080233C0:
adds r0, r5, #0
movs r1, #4
movs r2, #0
bl CreateFX
bl CreateFx
b _0802349C
_08023412:
movs r0, #0x28

14
asm/code_08023E10.s
View File

@ -1278,7 +1278,7 @@ _0802475E:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r4, #0
bl sub_0805E7BC
ldrh r0, [r5, #0x36]
@ -3825,7 +3825,7 @@ sub_08025AE8: @ 0x08025AE8
adds r4, r0, #0
movs r1, #0x22
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08025B00
@ -3836,7 +3836,7 @@ _08025B00:
adds r0, r4, #0
movs r1, #0x23
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08025B16
@ -4904,7 +4904,7 @@ _080262EC:
movs r1, #0xb2
lsls r1, r1, #2
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
_0802631A:
pop {r4, r5, r6, pc}
.align 2, 0
@ -8306,7 +8306,7 @@ sub_08027C9C: @ 0x08027C9C
adds r0, r5, #0
movs r1, #0x48
movs r2, #0
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _08027D1E
@ -9515,7 +9515,7 @@ _080285BC:
adds r0, r4, #0
movs r1, #2
movs r2, #0x40
bl CreateFX
bl CreateFx
_080285D6:
adds r1, r4, #0
adds r1, #0x7b
@ -10008,7 +10008,7 @@ sub_08028934: @ 0x08028934
adds r0, r4, #0
movs r1, #3
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08028982

6
asm/code_08028E40.s
View File

@ -44,7 +44,7 @@ _08028E80: .4byte gTextBox
sub_08028E84: @ 0x08028E84
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08028E98
movs r0, #4
@ -299,7 +299,7 @@ sub_08028FFC: @ 0x08028FFC
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, pc}
.align 2, 0
_08029074: .4byte 0x00004022
@ -351,7 +351,7 @@ _080290AE:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
_080290DE:
pop {r4, pc}

4
asm/code_08029A94.s
View File

@ -104,7 +104,7 @@ sub_08029B2C: @ 0x08029B2C
adds r0, r4, #0
movs r1, #0x48
movs r2, #0
bl CreateFX
bl CreateFx
adds r0, r4, #0
bl sub_0805E7BC
b _08029B8A
@ -289,7 +289,7 @@ sub_08029C98: @ 0x08029C98
adds r0, r4, #0
movs r1, #0x48
movs r2, #0
bl CreateFX
bl CreateFx
adds r0, r4, #0
bl sub_0805E7BC
b _08029CC6

60
asm/code_0802B234.s
View File

@ -136,7 +136,7 @@ sub_0802B2E0: @ 0x0802B2E0
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _0802B334
@ -2447,7 +2447,7 @@ _0802C408:
adds r0, r4, #0
movs r1, #0x15
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _0802C420
@ -4415,7 +4415,7 @@ _0802D2F8:
ldr r0, [r0]
movs r1, #0x48
movs r2, #0
bl CreateFX
bl CreateFx
cmp r0, #0
beq _0802D32E
adds r2, r0, #0
@ -6411,7 +6411,7 @@ _0802E23A:
ldr r0, [r1, #0x3c]
movs r1, #0xc
movs r2, #0
bl CreateFX
bl CreateFx
movs r0, #0x92
lsls r0, r0, #1
bl PlaySFX
@ -6681,7 +6681,7 @@ _0802E452:
ldr r0, [r6, #0x3c]
movs r1, #0xc
movs r2, #0
bl CreateFX
bl CreateFx
movs r0, #0x7d
bl PlaySFX
_0802E46E:
@ -8974,7 +8974,7 @@ _0802F536:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
_0802F556:
pop {r4, pc}
.align 2, 0
@ -9221,7 +9221,7 @@ _0802F6F0:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
ldrb r1, [r4, #0x15]
lsrs r1, r1, #3
adds r0, r4, #0
@ -9434,7 +9434,7 @@ sub_0802F888: @ 0x0802F888
ldr r0, _0802F8E0 @ =0x00004071
ldrh r1, [r5]
ldrb r2, [r6]
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, r5, r6, pc}
.align 2, 0
_0802F8DC: .4byte gRoomControls
@ -9800,7 +9800,7 @@ _0802FB88:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
_0802FBB0:
pop {r4, pc}
.align 2, 0
@ -10019,7 +10019,7 @@ _0802FD18:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
movs r0, #0xab
lsls r0, r0, #1
bl sub_08004488
@ -10170,7 +10170,7 @@ _0802FE6A:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
_0802FE8A:
pop {r4, pc}
.align 2, 0
@ -10389,7 +10389,7 @@ _0802FFF0:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
movs r0, #0xab
lsls r0, r0, #1
bl sub_08004488
@ -11465,7 +11465,7 @@ sub_080307EC: @ 0x080307EC
ldr r0, _08030830 @ =0x00004022
ldrb r2, [r6]
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, r5, r6, pc}
.align 2, 0
_0803082C: .4byte gRoomControls
@ -11496,7 +11496,7 @@ sub_08030834: @ 0x08030834
adds r0, #0x38
ldrb r2, [r0]
adds r0, r5, #0
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, r5, r6, pc}
.align 2, 0
_08030868: .4byte gRoomControls
@ -11605,7 +11605,7 @@ _0803093C:
mov r3, r8
ldrb r2, [r3]
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
b _0803098A
.align 2, 0
_0803094C: .4byte 0x00004022
@ -11636,7 +11636,7 @@ _08030950:
mov r0, r8
ldrb r2, [r0]
mov r0, sl
bl sub_0800015E
bl UpdateCollisionLayer
_0803098A:
adds r2, r5, #0
adds r2, #0x29
@ -11902,7 +11902,7 @@ _08030B52:
adds r0, r4, #0
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
_08030B6A:
adds r0, r4, #0
bl sub_0804A7D4
@ -12447,19 +12447,19 @@ sub_08030F00: @ 0x08030F00
ldrb r2, [r6]
adds r0, r5, #0
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
ldrb r2, [r6]
adds r0, r5, #0
mov r1, sl
bl sub_0800015E
bl UpdateCollisionLayer
ldrb r2, [r6]
adds r0, r5, #0
mov r1, sb
bl sub_0800015E
bl UpdateCollisionLayer
ldrb r2, [r6]
adds r0, r5, #0
mov r1, r8
bl sub_0800015E
bl UpdateCollisionLayer
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
@ -12498,27 +12498,27 @@ sub_08030FB4: @ 0x08030FB4
adds r5, #0x38
ldrb r2, [r5]
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r6, #0
adds r0, #0x82
ldrh r0, [r0]
adds r1, r4, #1
ldrb r2, [r5]
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r6, #0
adds r0, #0x84
ldrh r0, [r0]
adds r1, r4, #0
adds r1, #0x40
ldrb r2, [r5]
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r6, #0
adds r0, #0x86
ldrh r0, [r0]
adds r4, #0x41
ldrb r2, [r5]
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, r5, r6, pc}
.align 2, 0
_08031020: .4byte gRoomControls
@ -15691,7 +15691,7 @@ sub_08032794: @ 0x08032794
adds r4, r0, #0
movs r1, #0x11
movs r2, #0x40
bl CreateFX
bl CreateFx
adds r5, r0, #0
cmp r5, #0
beq _080327C2
@ -17147,7 +17147,7 @@ _08033238:
adds r0, r5, #0
movs r1, #2
movs r2, #0x40
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _08033278
@ -17633,7 +17633,7 @@ _080335EE:
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08033624
@ -18041,7 +18041,7 @@ sub_08033890: @ 0x08033890
ldr r0, _08033954 @ =0x00004022
ldrh r1, [r4]
ldrb r2, [r5]
bl sub_0800015E
bl UpdateCollisionLayer
ldrb r1, [r6, #0xa]
movs r0, #0x7d
movs r2, #0
@ -18486,7 +18486,7 @@ _08033C68:
ldrh r1, [r5]
ldr r3, [sp, #8]
ldrb r2, [r3]
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r4, #0
movs r1, #0
bl UpdateSprite

132
asm/code_08033FFC.s
View File

@ -519,7 +519,7 @@ _080343C4:
ldrb r1, [r1]
adds r0, r5, #0
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _08034414
@ -1803,7 +1803,7 @@ sub_08034CC4: @ 0x08034CC4
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
movs r0, #0x37
movs r1, #2
bl CreateEnemy
@ -1893,7 +1893,7 @@ sub_08034DC8: @ 0x08034DC8
adds r0, r4, #0
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
movs r1, #0x2e
ldrsh r0, [r4, r1]
ldr r2, _08034E14 @ =gRoomControls
@ -2052,7 +2052,7 @@ sub_08034EE4: @ 0x08034EE4
ldrb r1, [r1]
adds r0, r5, #0
movs r2, #0
bl CreateFX
bl CreateFx
adds r3, r0, #0
cmp r3, #0
beq _08034F46
@ -3050,14 +3050,14 @@ _08035616:
adds r0, r7, #0
movs r1, #0x48
movs r2, #0
bl CreateFX
bl CreateFx
adds r0, r7, #0
adds r0, #0x84
ldr r0, [r0]
ldr r0, [r0, #0x20]
movs r1, #0x48
movs r2, #0
bl CreateFX
bl CreateFx
_080356B2:
adds r1, r7, #0
adds r1, #0x82
@ -6541,7 +6541,7 @@ sub_080370A4: @ 0x080370A4
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
b _0803711E
.align 2, 0
_0803710C: .4byte gRoomControls
@ -6650,7 +6650,7 @@ sub_0803718C: @ 0x0803718C
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
_080371DA:
adds r0, r5, #0
bl sub_0806F520
@ -6734,7 +6734,7 @@ sub_08037220: @ 0x08037220
lsls r0, r0, #7
ldrb r2, [r6]
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r5, #0
movs r1, #5
bl UpdateSprite
@ -6775,7 +6775,7 @@ sub_08037280: @ 0x08037280
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r5, #0
bl sub_08037408
_080372CC:
@ -6860,7 +6860,7 @@ sub_080372E8: @ 0x080372E8
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
_0803736E:
pop {r4, r5, r6, pc}
.align 2, 0
@ -6954,7 +6954,7 @@ sub_08037408: @ 0x08037408
push {lr}
movs r1, #5
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
pop {pc}
@ -6991,7 +6991,7 @@ sub_08037418: @ 0x08037418
ldrh r0, [r0]
ldrb r2, [r6]
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
bl sub_0805E780
_08037460:
pop {r4, r5, r6, pc}
@ -9458,7 +9458,7 @@ sub_080386B8: @ 0x080386B8
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08038720
@ -9565,7 +9565,7 @@ _080387D8:
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _080387EE
@ -10950,7 +10950,7 @@ sub_08039260: @ 0x08039260
ldrb r1, [r1]
adds r0, r4, #0
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _0803928E
@ -11932,7 +11932,7 @@ sub_080399C4: @ 0x080399C4
adds r4, r0, #0
movs r1, #0x11
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _080399E2
@ -11946,7 +11946,7 @@ _080399E2:
adds r0, r4, #0
movs r1, #0x11
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _080399FE
@ -12100,7 +12100,7 @@ sub_08039AD4: @ 0x08039AD4
adds r1, #0x38
ldrb r2, [r1]
adds r1, r5, #0
bl sub_0800015E
bl UpdateCollisionLayer
b _08039B26
.align 2, 0
_08039B18: .4byte 0x0000FFFF
@ -12268,7 +12268,7 @@ sub_08039BF8: @ 0x08039BF8
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
b _08039C72
.align 2, 0
_08039C60: .4byte gRoomControls
@ -12375,7 +12375,7 @@ sub_08039CE0: @ 0x08039CE0
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
_08039D2A:
adds r0, r5, #0
bl sub_0806F520
@ -12461,7 +12461,7 @@ sub_08039D74: @ 0x08039D74
ldr r0, _08039DD4 @ =0x00004060
ldrb r2, [r6]
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r5, #0
movs r1, #0
bl UpdateSprite
@ -12505,7 +12505,7 @@ sub_08039DD8: @ 0x08039DD8
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r5, #0
bl sub_0803A0E0
_08039E28:
@ -12578,7 +12578,7 @@ _08039E74:
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r5, #0
bl sub_0805E7BC
_08039EC6:
@ -12643,7 +12643,7 @@ sub_08039EE4: @ 0x08039EE4
mov r2, ip
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, r5, r6, pc}
.align 2, 0
_08039F40: .4byte gUnk_080FD340
@ -12777,7 +12777,7 @@ sub_08039FAC: @ 0x08039FAC
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
_0803A03A:
pop {r4, r5, r6, pc}
.align 2, 0
@ -12880,7 +12880,7 @@ sub_0803A0E0: @ 0x0803A0E0
adds r2, r0, #0
adds r0, r4, #0
movs r1, #0x3c
bl CreateFX
bl CreateFx
bl sub_0805E780
pop {r4, pc}
.align 2, 0
@ -12918,7 +12918,7 @@ sub_0803A100: @ 0x0803A100
ldrh r0, [r0]
ldrb r2, [r6]
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
bl sub_0805E780
_0803A148:
pop {r4, r5, r6, pc}
@ -15122,7 +15122,7 @@ _0803B1D4:
adds r0, r5, #0
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _0803B23A
@ -18044,7 +18044,7 @@ _0803C7A2:
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _0803C7FA
@ -18659,7 +18659,7 @@ sub_0803CC08: @ 0x0803CC08
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _0803CC56
@ -18673,7 +18673,7 @@ _0803CC56:
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _0803CC72
@ -18687,7 +18687,7 @@ _0803CC72:
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _0803CC8E
@ -18701,7 +18701,7 @@ _0803CC8E:
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _0803CCAA
@ -18937,7 +18937,7 @@ sub_0803CE3C: @ 0x0803CE3C
adds r4, r0, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
movs r0, #2
strb r0, [r4, #0xc]
movs r0, #0x3c
@ -20387,7 +20387,7 @@ _0803D918:
adds r0, r2, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _0803D968
@ -21979,7 +21979,7 @@ sub_0803E4D8: @ 0x0803E4D8
ldr r0, _0803E524 @ =0x00004074
ldrb r2, [r5]
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
_0803E518:
pop {r4, r5, pc}
.align 2, 0
@ -23756,7 +23756,7 @@ sub_0803F20C: @ 0x0803F20C
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
cmp r0, #0
beq _0803F23E
adds r2, r0, #0
@ -25706,7 +25706,7 @@ _080400C2:
adds r0, r4, #0
movs r1, #0x55
movs r2, #0
bl CreateFX
bl CreateFx
adds r5, r0, #0
cmp r5, #0
beq _08040120
@ -27119,7 +27119,7 @@ _08040B4E:
adds r0, r5, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_08040B5C:
ldr r4, _08040B80 @ =gUnk_080D0DC4
@ -27473,7 +27473,7 @@ sub_08040DF4: @ 0x08040DF4
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
cmp r0, #0
beq _08040E26
adds r2, r0, #0
@ -29601,7 +29601,7 @@ sub_08041E78: @ 0x08041E78
adds r0, r4, #0
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _08041ECE
@ -32893,7 +32893,7 @@ sub_080436C0: @ 0x080436C0
ldr r0, [r0, #4]
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
ldr r0, [r4, #0x64]
ldr r0, [r0, #4]
str r5, [r0, #0x64]
@ -32923,7 +32923,7 @@ sub_08043700: @ 0x08043700
ldr r0, [r0, #8]
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
ldr r0, [r4, #0x64]
ldr r0, [r0, #8]
str r5, [r0, #0x64]
@ -32953,7 +32953,7 @@ sub_08043738: @ 0x08043738
ldr r0, [r0, #0xc]
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
ldr r0, [r4, #0x64]
ldr r0, [r0, #0xc]
str r5, [r0, #0x64]
@ -33748,7 +33748,7 @@ sub_08043D08: @ 0x08043D08
adds r0, r4, #0
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _08043D78
@ -36438,7 +36438,7 @@ _08045142:
mov r0, r8
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r6, r0, #0
cmp r6, #0
beq _0804515A
@ -36933,7 +36933,7 @@ _080454EE:
mov r0, r8
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r6, r0, #0
cmp r6, #0
beq _08045506
@ -37889,7 +37889,7 @@ sub_08045BC8: @ 0x08045BC8
adds r0, r4, #0
movs r1, #3
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08045C16
@ -38495,7 +38495,7 @@ _0804608A:
adds r0, r7, #0
movs r1, #2
movs r2, #0x40
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _080460AE
@ -38534,7 +38534,7 @@ _080460AE:
adds r0, r7, #0
movs r1, #0x43
movs r2, #0x40
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08046102
@ -39387,7 +39387,7 @@ _0804674C:
adds r0, r4, #0
movs r1, #0x2c
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _080467CC
@ -42136,7 +42136,7 @@ sub_08047BF0: @ 0x08047BF0
adds r0, r5, #0
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _08047C74
@ -42229,7 +42229,7 @@ _08047CDC:
adds r0, r4, #0
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
b _08047D10
_08047CF2:
cmp r0, #0x1e
@ -42245,7 +42245,7 @@ _08047CF2:
adds r0, r4, #0
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
_08047D10:
adds r0, r5, #0
adds r0, #0x78
@ -43344,7 +43344,7 @@ sub_080484E8: @ 0x080484E8
adds r0, r4, #0
movs r1, #0x1f
movs r2, #0x40
bl CreateFX
bl CreateFx
ldr r2, [r4, #0x50]
adds r2, #0x7b
movs r0, #0x10
@ -44156,7 +44156,7 @@ sub_08048B2C: @ 0x08048B2C
adds r0, r4, #0
movs r1, #2
movs r2, #0x40
bl CreateFX
bl CreateFx
_08048B52:
ldrb r0, [r4, #0x18]
movs r1, #4
@ -44273,7 +44273,7 @@ _08048BFC:
adds r0, r4, #0
movs r1, #2
movs r2, #0x40
bl CreateFX
bl CreateFx
b _08048CEA
.align 2, 0
_08048C30: .4byte gUnk_080D2010
@ -44925,19 +44925,19 @@ sub_08049100: @ 0x08049100
adds r0, r4, #0
movs r1, #0xa
movs r2, #2
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r4, #0
movs r1, #0x4a
movs r2, #2
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r4, #0
movs r1, #0x8a
movs r2, #2
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r4, #0
movs r1, #0xca
movs r2, #2
bl sub_0800015E
bl UpdateCollisionLayer
bl sub_0805E780
b _0804916E
.align 2, 0
@ -45975,7 +45975,7 @@ _080498FC:
movs r1, #0x4a
_0804990E:
movs r2, #2
bl sub_0800015E
bl UpdateCollisionLayer
movs r0, #0x71
bl PlaySFX
b _0804993E
@ -45991,7 +45991,7 @@ _08049920:
ldr r0, _08049940 @ =0x00004081
movs r1, #0xa
movs r2, #2
bl sub_0800015E
bl UpdateCollisionLayer
movs r0, #0x71
bl PlaySFX
_0804993E:
@ -46203,7 +46203,7 @@ sub_08049AB0: @ 0x08049AB0
adds r0, r2, #0
movs r1, #0x48
movs r2, #0
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _08049B18
@ -48265,7 +48265,7 @@ sub_0804A9FC: @ 0x0804A9FC
bne _0804AA16
adds r0, r4, #0
movs r2, #0
bl CreateFX
bl CreateFx
cmp r0, #0
beq _0804AA16
str r0, [r4, #0x68]

60
asm/code_0804B9F8.s
View File

@ -535,23 +535,23 @@ sub_0804BD50: @ 0x0804BD50
ldr r1, _0804BD9C @ =0x0000014D
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
movs r1, #0x86
lsls r1, r1, #1
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r4, #0x1e
movs r1, #0xa6
lsls r1, r1, #1
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
movs r1, #0xc6
lsls r1, r1, #1
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r0, _0804BDA0 @ =gUnk_080D7D34
bl LoadRoomEntityList
_0804BD94:
@ -1016,11 +1016,11 @@ _0804C090:
ldr r1, _0804C0F4 @ =0x00000A47
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804C0F8 @ =0x00000C47
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
movs r0, #0x62
bl GetProgressFlag
cmp r0, #0
@ -6853,7 +6853,7 @@ _0804E168:
ldrh r0, [r4, #4]
ldrh r1, [r4, #2]
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
_0804E17A:
adds r4, #6
_0804E17C:
@ -6881,7 +6881,7 @@ _0804E1A0:
ldrh r0, [r4, #4]
ldrh r1, [r4, #2]
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
_0804E1B2:
adds r4, #6
_0804E1B4:
@ -6910,7 +6910,7 @@ _0804E1D8:
ldrh r0, [r4, #4]
ldrh r1, [r4, #2]
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
_0804E1EA:
adds r4, #6
_0804E1EC:
@ -8059,71 +8059,71 @@ _0804EA14:
lsls r1, r1, #3
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804EAD8 @ =0x00000591
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804EADC @ =0x00000592
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804EAE0 @ =0x00000593
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804EAE4 @ =0x00000594
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
movs r1, #0xba
lsls r1, r1, #3
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
movs r1, #0xc2
lsls r1, r1, #3
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
movs r1, #0xca
lsls r1, r1, #3
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804EAE8 @ =0x000005D4
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804EAEC @ =0x00000614
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804EAF0 @ =0x00000654
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
movs r1, #0xd2
lsls r1, r1, #3
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804EAF4 @ =0x00000691
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804EAF8 @ =0x00000692
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804EAFC @ =0x00000693
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _0804EB00 @ =0x00000694
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, pc}
.align 2, 0
_0804EAC4: .4byte gUnk_080F3C64
@ -9473,11 +9473,11 @@ _0804F406:
ldr r0, _0804F450 @ =0x00004072
ldr r1, _0804F454 @ =0x00000D88
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r0, _0804F458 @ =0x00004096
ldr r1, _0804F45C @ =0x00000DC8
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
_0804F42A:
ldr r0, _0804F460 @ =gUnk_02002A40
ldrb r0, [r0, #8]
@ -9734,7 +9734,7 @@ sub_0804F680: @ 0x0804F680
adds r5, r2, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _0804F6A2
@ -9877,7 +9877,7 @@ sub_0804F79C: @ 0x0804F79C
adds r4, r0, #0
movs r1, #0x35
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _0804F7D0
@ -9902,7 +9902,7 @@ _0804F7D0:
adds r0, r4, #0
movs r1, #0x35
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _0804F802

4
asm/code_0805436C.s
View File

@ -1545,7 +1545,7 @@ sub_08054EFC: @ 0x08054EFC
subs r1, #0x40
ldr r0, _08054F60 @ =0x00004074
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r1, r4, #0
adds r1, #0x38
movs r0, #2
@ -1555,7 +1555,7 @@ sub_08054EFC: @ 0x08054EFC
adds r0, r4, #0
movs r1, #0x35
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08054F54

12
asm/code_08056418.s
View File

@ -2697,17 +2697,17 @@ _080578E0:
adds r1, #0x3f
adds r0, r6, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldrh r1, [r4]
adds r1, #0x40
adds r0, r6, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldrh r1, [r4]
adds r1, #0x41
adds r0, r6, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r4, #8
_08057906:
adds r0, r4, #0
@ -12689,7 +12689,7 @@ sub_0805C61C: @ 0x0805C61C
movs r2, #0x38
ldrsh r1, [r4, r2]
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
b _0805C674
.align 2, 0
_0805C668: .4byte gRoomControls
@ -12721,7 +12721,7 @@ _0805C694:
ldrsh r1, [r4, r2]
adds r0, r5, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
bl sub_0805E780
_0805C6B2:
pop {r4, r5, pc}
@ -14197,7 +14197,7 @@ sub_0805D1FC: @ 0x0805D1FC
ldr r0, _0805D240 @ =0x00004014
ldr r1, _0805D244 @ =0x000005C3
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r3, _0805D248 @ =gRoomControls
ldrh r0, [r3, #8]
adds r0, #0xc8

4
asm/code_0805E744.s
View File

@ -2912,7 +2912,7 @@ _0805FCA4:
adds r0, r4, #0
movs r1, #0x19
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_0805FCF6:
adds r0, r4, #0
@ -2923,7 +2923,7 @@ _0805FCF6:
adds r0, r4, #0
movs r1, #0x19
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
b _0805FD20
.align 2, 0

4
asm/code_0806ED78.s
View File

@ -557,8 +557,8 @@ sub_0806F118: @ 0x0806F118
_0806F140: .4byte gUnk_08001A7C
_0806F144: .4byte gLinkState
thumb_func_start sub_0806F148
sub_0806F148: @ 0x0806F148
thumb_func_start UpdateFuseInteraction
UpdateFuseInteraction: @ 0x0806F148
push {r4, lr}
bl sub_0801E00C
movs r4, #1

16
asm/code_0806FA6C.s
View File

@ -1226,7 +1226,7 @@ _08070280:
lsls r2, r2, #6
orrs r1, r2
ldrb r2, [r4]
bl sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
_0807049E:
adds r0, r4, #0
movs r1, #0x13
@ -3195,7 +3195,7 @@ _080712C4:
adds r0, r4, #0
movs r1, #0xb
movs r2, #0
bl CreateFX
bl CreateFx
ldr r0, [r5, #0x30]
movs r1, #8
ands r0, r1
@ -4968,7 +4968,7 @@ sub_08072008: @ 0x08072008
adds r0, r3, #0
movs r1, #0xd
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_080791BC
pop {pc}
.align 2, 0
@ -5421,7 +5421,7 @@ sub_08072354: @ 0x08072354
adds r0, r4, #0
movs r1, #0xc
movs r2, #0
bl CreateFX
bl CreateFx
movs r0, #0xd3
lsls r0, r0, #1
bl PlaySFX
@ -5903,7 +5903,7 @@ _0807274C:
ldr r0, _080727A4 @ =gLinkEntity
movs r1, #0x11
movs r2, #0x40
bl CreateFX
bl CreateFx
movs r0, #4
strb r0, [r4, #0xe]
_0807277E:
@ -6268,7 +6268,7 @@ _08072A14:
lsls r2, r2, #6
orrs r1, r2
ldrb r2, [r6]
bl sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
ldrb r0, [r5, #0x14]
lsls r0, r0, #2
strb r0, [r5, #0x15]

12
asm/code_080732D0.s
View File

@ -2688,7 +2688,7 @@ _080746DC:
adds r0, r4, #0
movs r1, #0x52
movs r2, #0
bl CreateFX
bl CreateFx
b _08074714
.align 2, 0
_08074700: .4byte gLinkState
@ -2753,7 +2753,7 @@ _0807476C:
adds r0, r4, #0
movs r1, #0x52
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r4, #0
adds r1, #0x3d
movs r0, #0x20
@ -2869,7 +2869,7 @@ _08074840:
adds r0, r6, #0
movs r1, #0xb
movs r2, #0
bl CreateFX
bl CreateFx
_08074862:
ldr r0, _080748B0 @ =0x000001A5
bl PlaySFX
@ -5177,7 +5177,7 @@ _08075962:
adds r0, r4, #0
movs r1, #0x11
movs r2, #0x40
bl CreateFX
bl CreateFx
b _080759B2
.align 2, 0
_08075990: .4byte gLinkEntity
@ -7113,7 +7113,7 @@ _0807684A:
adds r0, r4, #0
movs r1, #0x52
movs r2, #0
bl CreateFX
bl CreateFx
b _080768DA
.align 2, 0
_08076880: .4byte gLinkState
@ -7121,7 +7121,7 @@ _08076884:
adds r0, r4, #0
movs r1, #0x11
movs r2, #0x40
bl CreateFX
bl CreateFx
adds r5, r0, #0
cmp r5, #0
beq _080768DA

4
asm/code_08076C80.s
View File

@ -928,7 +928,7 @@ _080773BC:
adds r0, r5, #0
movs r1, #0x1d
movs r2, #0
bl CreateFX
bl CreateFx
adds r3, r0, #0
cmp r3, #0
beq _080773F6
@ -953,7 +953,7 @@ _080773F6:
adds r0, r5, #0
movs r1, #0x1d
movs r2, #0
bl CreateFX
bl CreateFx
adds r3, r0, #0
cmp r3, #0
beq _08077432

6
asm/code_08077B98.s
View File

@ -6485,7 +6485,7 @@ _0807ABF4:
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
_0807AC44:
pop {r3, r4, r5}
mov r8, r3
@ -6980,7 +6980,7 @@ sub_0807AFE8: @ 0x0807AFE8
ldr r0, _0807B00C @ =gLinkEntity
movs r1, #0x43
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _0807B004
@ -7534,7 +7534,7 @@ _0807B410:
adds r0, r5, #0
adds r1, r4, #0
adds r2, r6, #0
bl sub_0800015E
bl UpdateCollisionLayer
b _0807B430
.align 2, 0
_0807B424: .4byte 0x00003FFF

6
asm/code_0807B9B8.s
View File

@ -261,7 +261,7 @@ _0807BBBC:
adds r1, r5, r4
ldr r0, _0807BBE0 @ =0x00004072
mov r2, sl
bl sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
ldr r3, [sp, #4]
_0807C4BE:
adds r7, #2

2
asm/code_0807CC3C.s
View File

@ -5575,7 +5575,7 @@ sub_0807F36C: @ 0x0807F36C
adds r5, r0, #0
movs r1, #0x41
movs r2, #0
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _0807F3C2

47239
asm/code_08080974.s
View File

File diff suppressed because it is too large Load Diff

45777
asm/code_080874A0.s Normal file
View File

File diff suppressed because it is too large Load Diff

98
asm/code_0809D498.s
View File

@ -580,7 +580,7 @@ sub_0809D91C: @ 0x0809D91C
adds r4, r0, #0
movs r1, #0x11
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _0809D934
@ -2305,70 +2305,70 @@ _0809E636:
adds r1, r5, #0
subs r1, #0x3d
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r0, _0809E6E0 @ =0x0000406D
adds r1, r5, #0
subs r1, #0x3c
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
_0809E64E:
ldr r0, _0809E6E4 @ =0x0000406C
adds r1, r5, #0
subs r1, #0x42
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r4, _0809E6DC @ =0x00004022
adds r1, r5, #0
subs r1, #0x41
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r1, r5, #0
subs r1, #0x40
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r1, r5, #0
subs r1, #0x3f
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
subs r1, r5, #2
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
subs r1, r5, #1
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r4, #0
adds r1, r5, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r1, r5, #1
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r0, _0809E6E8 @ =0x0000406E
adds r1, r5, #0
adds r1, #0x3e
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r1, r5, #0
adds r1, #0x3f
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r1, r5, #0
adds r1, #0x40
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r0, _0809E6EC @ =0x0000406F
adds r1, r5, #0
adds r1, #0x41
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
b _0809E792
.align 2, 0
_0809E6DC: .4byte 0x00004022
@ -2381,70 +2381,70 @@ _0809E6F0:
adds r1, r5, #0
subs r1, #0x44
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r0, _0809E798 @ =0x0000406C
adds r1, r5, #0
subs r1, #0x45
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
_0809E708:
ldr r4, _0809E794 @ =0x00004022
adds r1, r5, #0
subs r1, #0x42
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r1, r5, #0
subs r1, #0x41
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r1, r5, #0
subs r1, #0x40
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r0, _0809E79C @ =0x0000406D
adds r1, r5, #0
subs r1, #0x3f
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
subs r1, r5, #2
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
subs r1, r5, #1
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r4, #0
adds r1, r5, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r1, r5, #1
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r0, _0809E7A0 @ =0x0000406E
adds r1, r5, #0
adds r1, #0x3e
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r1, r5, #0
adds r1, #0x3f
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
adds r1, r5, #0
adds r1, #0x40
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r0, _0809E7A4 @ =0x0000406F
adds r1, r5, #0
adds r1, #0x41
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
_0809E792:
pop {r4, r5, pc}
.align 2, 0
@ -2660,7 +2660,7 @@ _0809E92A:
adds r0, r5, #0
movs r1, #3
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _0809E958
@ -2916,7 +2916,7 @@ _0809EAF8:
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
_0809EB24:
pop {r4, r5, r6, pc}
.align 2, 0
@ -3140,11 +3140,11 @@ sub_0809EC4C: @ 0x0809EC4C
ldr r0, _0809ECFC @ =0x00004066
subs r1, r4, #1
ldrb r2, [r5]
bl sub_0800015E
bl UpdateCollisionLayer
ldr r0, _0809ED00 @ =0x00004065
ldrb r2, [r5]
adds r1, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r6, #0
bl UpdateSpriteOrderAndFlip
movs r0, #0x9e
@ -3751,7 +3751,7 @@ sub_0809F144: @ 0x0809F144
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
ldrb r1, [r4, #0xa]
adds r0, r4, #0
bl UpdateSprite
@ -3943,7 +3943,7 @@ sub_0809F2A0: @ 0x0809F2A0
adds r0, #0x38
ldrb r2, [r0]
adds r0, r5, #0
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, r5, r6, pc}
.align 2, 0
_0809F2EC: .4byte 0x00004069
@ -4110,7 +4110,7 @@ _0809F41C:
adds r0, r2, #0
movs r1, #0x43
movs r2, #0
bl CreateFX
bl CreateFx
ldr r1, _0809F434 @ =gUnk_02000080
movs r0, #1
strb r0, [r1]
@ -4827,7 +4827,7 @@ sub_0809F964: @ 0x0809F964
adds r0, r4, #0
movs r1, #0x4e
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _0809F99A
@ -6668,7 +6668,7 @@ sub_080A074C: @ 0x080A074C
adds r0, r4, #0
movs r1, #0x11
movs r2, #0x40
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _080A0794
@ -6682,7 +6682,7 @@ _080A0794:
adds r0, r4, #0
movs r1, #0x11
movs r2, #0x40
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _080A07B0
@ -6776,16 +6776,16 @@ sub_080A080C: @ 0x080A080C
subs r1, #1
ldrb r2, [r5]
adds r0, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
ldrh r1, [r6]
ldrb r2, [r5]
adds r0, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
ldrh r1, [r6]
adds r1, #1
ldrb r2, [r5]
adds r0, r4, #0
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, r5, r6, pc}
.align 2, 0
_080A086C: .4byte 0x00004022
@ -6803,20 +6803,20 @@ sub_080A0870: @ 0x080A0870
adds r4, r6, #0
adds r4, #0x38
ldrb r2, [r4]
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r6, #0
adds r0, #0x78
ldrh r0, [r0]
ldrh r1, [r5]
ldrb r2, [r4]
bl sub_0800015E
bl UpdateCollisionLayer
adds r0, r6, #0
adds r0, #0x7a
ldrh r0, [r0]
ldrh r1, [r5]
adds r1, #1
ldrb r2, [r4]
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, r5, r6, pc}
.align 2, 0
@ -7652,7 +7652,7 @@ sub_080A0EB0: @ 0x080A0EB0
ldrh r1, [r0]
adds r0, r2, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, r5, pc}
.align 2, 0
_080A0EE8: .4byte gRoomControls
@ -9679,7 +9679,7 @@ sub_080A1E54: @ 0x080A1E54
adds r0, r2, #0
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _080A1ECA
@ -9898,7 +9898,7 @@ sub_080A1FF0: @ 0x080A1FF0
adds r0, r5, #0
movs r1, #0x51
movs r2, #0
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _080A2066
@ -10066,7 +10066,7 @@ sub_080A2138: @ 0x080A2138
adds r0, r4, #0
movs r1, #0x46
movs r2, #0
bl CreateFX
bl CreateFx
pop {r4, pc}
.align 2, 0
_080A2160: .4byte gUnk_02002A40

16
asm/code_080A29BC.s
View File

@ -10,7 +10,7 @@ sub_080A29BC: @ 0x080A29BC
push {lr}
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
pop {pc}
thumb_func_start sub_080A29C8
@ -46,7 +46,7 @@ sub_080A29FC: @ 0x080A29FC
push {lr}
movs r1, #0x11
movs r2, #0
bl CreateFX
bl CreateFx
pop {pc}
thumb_func_start sub_080A2A08
@ -54,7 +54,7 @@ sub_080A2A08: @ 0x080A2A08
push {lr}
movs r1, #6
movs r2, #0
bl CreateFX
bl CreateFx
pop {pc}
thumb_func_start sub_080A2A14
@ -62,7 +62,7 @@ sub_080A2A14: @ 0x080A2A14
push {lr}
movs r1, #0xb
movs r2, #0
bl CreateFX
bl CreateFx
pop {pc}
thumb_func_start sub_080A2A20
@ -110,7 +110,7 @@ sub_080A2A64: @ 0x080A2A64
push {lr}
movs r1, #0x20
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _080A2A80
@ -171,7 +171,7 @@ sub_080A2AD4: @ 0x080A2AD4
push {lr}
movs r1, #0x21
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _080A2AF0
@ -1058,7 +1058,7 @@ _080A315C:
adds r0, r4, #0
movs r1, #0x19
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_080A31AE:
adds r0, r4, #0
@ -1069,7 +1069,7 @@ _080A31AE:
adds r0, r4, #0
movs r1, #0x19
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_080A31C6:
adds r0, r4, #0

54
asm/code_080A5574.s
View File

@ -4301,7 +4301,7 @@ _080A776A:
_080A778E:
adds r0, r4, #0
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _080A77C4
@ -6799,13 +6799,13 @@ _080A89E6:
movs r1, #0
_080A89EA:
movs r2, #0
bl CreateFX
bl CreateFx
b _080A89FC
_080A89F2:
adds r0, r5, #0
movs r1, #0xc
movs r2, #0
bl CreateFX
bl CreateFx
_080A89FC:
bl sub_0805E780
_080A8A00:
@ -6834,7 +6834,7 @@ _080A8A2A:
adds r0, r5, #0
movs r1, #5
movs r2, #0x80
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _080A8A3E
@ -7578,7 +7578,7 @@ sub_080A8FB8: @ 0x080A8FB8
adds r0, r4, #0
movs r1, #4
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
b _080A9054
_080A8FE8:
@ -8890,7 +8890,7 @@ _080A99D2:
adds r0, r4, #0
movs r1, #4
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_080A99EE:
pop {r4, r5, pc}
@ -8900,7 +8900,7 @@ sub_080A99F0: @ 0x080A99F0
push {lr}
movs r1, #4
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
pop {pc}
@ -9163,13 +9163,13 @@ sub_080A9BA8: @ 0x080A9BA8
adds r0, r1, #0
movs r1, #5
movs r2, #0
bl CreateFX
bl CreateFx
b _080A9BC8
_080A9BBE:
adds r0, r1, #0
movs r1, #0x3c
movs r2, #0
bl CreateFX
bl CreateFx
_080A9BC8:
bl sub_0805E780
pop {pc}
@ -9349,7 +9349,7 @@ sub_080A9CF0: @ 0x080A9CF0
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_080A9D0A:
ldr r0, _080A9D1C @ =gUnk_08129B78
@ -9398,7 +9398,7 @@ _080A9D56:
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_080A9D64:
pop {r4, pc}
@ -9518,7 +9518,7 @@ _080A9E34:
adds r0, r4, #0
movs r1, #0x4f
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_080A9E42:
adds r0, r4, #0
@ -9776,7 +9776,7 @@ _080A9FF2:
ldr r0, _080AA040 @ =0x00004005
ldrh r1, [r4]
ldrb r2, [r5]
bl sub_0800015E
bl UpdateCollisionLayer
_080AA034:
pop {r4, r5, pc}
.align 2, 0
@ -10428,7 +10428,7 @@ _080AA4EE:
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
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 sub_0800015E
bl UpdateCollisionLayer
pop {r4, r5, r6, pc}
.align 2, 0
_080AAAA0: .4byte gUnk_0812A084
@ -11476,7 +11476,7 @@ _080AACF4:
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
_080AAD16:
ldr r2, [r4, #0x50]
ldrb r0, [r4, #0xb]
@ -11521,7 +11521,7 @@ _080AAD58:
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
_080AAD68:
bl sub_0805E780
pop {r4, r5, pc}
@ -12634,7 +12634,7 @@ sub_080AB59C: @ 0x080AB59C
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_080AB5BC:
adds r0, r4, #0
@ -12658,7 +12658,7 @@ sub_080AB5C4: @ 0x080AB5C4
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_080AB5F0:
pop {r4, pc}
@ -12736,7 +12736,7 @@ _080AB640:
ldr r0, [r4]
movs r1, #0x45
movs r2, #0
bl CreateFX
bl CreateFx
_080AB67A:
adds r0, r6, #0
bl sub_0805E7BC
@ -13548,7 +13548,7 @@ sub_080ABC54: @ 0x080ABC54
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_080ABC6E:
ldr r0, _080ABC80 @ =gUnk_0812A808
@ -13591,7 +13591,7 @@ sub_080ABC90: @ 0x080ABC90
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_080ABCBE:
pop {r4, pc}
@ -13832,7 +13832,7 @@ sub_080ABE88: @ 0x080ABE88
adds r0, r4, #0
movs r1, #4
movs r2, #0
bl CreateFX
bl CreateFx
bl sub_0805E780
_080ABEA6:
pop {r4, pc}
@ -15589,7 +15589,7 @@ sub_080ACB90: @ 0x080ACB90
adds r0, r2, #0
movs r1, #0x1f
movs r2, #0x40
bl CreateFX
bl CreateFx
ldr r0, _080ACBC8 @ =0x00000119
bl sub_08004488
bl sub_0805E780
@ -16327,13 +16327,13 @@ _080AD12C:
movs r1, #0xb
_080AD130:
movs r2, #0
bl CreateFX
bl CreateFx
b _080AD142
_080AD138:
adds r0, r4, #0
movs r1, #0x52
movs r2, #0
bl CreateFX
bl CreateFx
_080AD142:
movs r0, #4
b _080AD148
@ -16354,7 +16354,7 @@ _080AD14E:
ldrb r1, [r4, #0xe]
adds r0, r4, #0
movs r2, #0x80
bl CreateFX
bl CreateFx
b _080AD1DA
_080AD16A:
ldrb r1, [r4, #0xb]

2
asm/cow.s
View File

@ -320,7 +320,7 @@ _080691DE:
sub_080691E0: @ 0x080691E0
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _080691F4
movs r1, #0

4
asm/createFx.s
View File

@ -2,8 +2,8 @@
.text
.syntax unified
thumb_func_start CreateFX
CreateFX: @ 0x080A29AC
thumb_func_start CreateFx
CreateFx: @ 0x080A29AC
push {r4, lr}
adds r4, r1, #0
adds r3, r2, #0

2
asm/cucco.s
View File

@ -223,7 +223,7 @@ _0806E638:
sub_0806E648: @ 0x0806E648
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806E658
movs r0, #1

2
asm/cuccoChick.s
View File

@ -152,7 +152,7 @@ _0806E81C:
sub_0806E824: @ 0x0806E824
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806E834
movs r0, #1

2
asm/dampe.s
View File

@ -70,7 +70,7 @@ _0806BE26:
adds r0, r4, #0
bl sub_080042B8
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806BE3A
movs r0, #1

2
asm/din.s
View File

@ -69,7 +69,7 @@ _08064800:
b _08064824
_0806480A:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08064824
movs r0, #1

4
asm/dog.s
View File

@ -141,7 +141,7 @@ _08069BF2:
adds r2, r5, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_0800015E
bl UpdateCollisionLayer
_08069C30:
pop {r4, r5, r6, pc}
.align 2, 0
@ -484,7 +484,7 @@ _08069EC8:
sub_08069ECC: @ 0x08069ECC
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08069EDC
movs r0, #1

1
asm/drLeft.s
View File

@ -6,7 +6,6 @@
.text
thumb_func_start sub_0806BF80
sub_0806BF80: @ 0x0806BF80
push {r4, lr}

56
asm/emma.s
View File

@ -1,56 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0806C550
sub_0806C550: @ 0x0806C550
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #0
bne _0806C56E
adds r0, #1
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #2
bl sub_0805E3A0
adds r0, r4, #0
bl sub_0807DD50
b _0806C576
_0806C56E:
adds r0, r4, #0
movs r1, #0
bl sub_0807DD94
_0806C576:
pop {r4, pc}
thumb_func_start sub_0806C578
sub_0806C578: @ 0x0806C578
push {lr}
ldr r0, _0806C584 @ =gUnk_0813AD10
bl sub_08080840
pop {pc}
.align 2, 0
_0806C584: .4byte gUnk_0813AD10
thumb_func_start sub_0806C588
sub_0806C588: @ 0x0806C588
push {lr}
ldr r0, _0806C594 @ =gUnk_0813AD24
bl sub_08080840
pop {pc}
.align 2, 0
_0806C594: .4byte gUnk_0813AD24
thumb_func_start sub_0806C598
sub_0806C598: @ 0x0806C598
push {lr}
ldr r0, _0806C5A4 @ =gUnk_0813AD38
bl sub_08080840
pop {pc}
.align 2, 0
_0806C5A4: .4byte gUnk_0813AD38

2
asm/epona.s
View File

@ -97,7 +97,7 @@ _08065A30: .4byte gTextBox
sub_08065A34: @ 0x08065A34
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08065A4E
movs r0, #1

2
asm/ezloCap.s
View File

@ -144,7 +144,7 @@ sub_0806D96C: @ 0x0806D96C
adds r4, r0, #0
movs r1, #0x42
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _0806D99C

2
asm/farore.s
View File

@ -69,7 +69,7 @@ _08064A00:
b _08064A24
_08064A0A:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08064A24
movs r0, #1

2
asm/festari.s
View File

@ -141,7 +141,7 @@ _0805FF14:
sub_0805FF18: @ 0x0805FF18
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0805FF28
movs r0, #1

2
asm/forestMinish.s
View File

@ -88,7 +88,7 @@ _0806005E:
b _0806008C
_0806007E:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806008C
movs r0, #1

2
asm/gentari.s
View File

@ -75,7 +75,7 @@ _0805FDA4:
b _0805FDBC
_0805FDAE:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0805FDBC
movs r0, #1

2
asm/ghostBrothers.s
View File

@ -121,7 +121,7 @@ _08065C74:
b _08065CCA
_08065C7E:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08065CCA
b _08065CC6

2
asm/gina.s
View File

@ -72,7 +72,7 @@ _0806C1B4:
b _0806C1D2
_0806C1BE:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806C1D2
movs r0, #1

4
asm/goron.s
View File

@ -195,7 +195,7 @@ sub_08069428: @ 0x08069428
adds r6, r2, #0
movs r1, #4
movs r2, #0
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _08069452
@ -213,7 +213,7 @@ _08069452:
adds r0, r5, #0
movs r1, #0x41
movs r2, #0
bl CreateFX
bl CreateFx
adds r4, r0, #0
cmp r4, #0
beq _0806947A

1314
asm/greatFairy.s Normal file
View File

File diff suppressed because it is too large Load Diff

2
asm/gregal.s
View File

@ -227,7 +227,7 @@ _0806CC80:
b _0806CCB0
_0806CC96:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806CCB0
movs r0, #1

2
asm/hurdyGurdyMan.s
View File

@ -98,7 +98,7 @@ _0806E3BC:
b _0806E3E0
_0806E3C6:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806E3E0
movs r0, #1

14
asm/kid.s
View File

@ -291,7 +291,7 @@ _080622CC:
_080622E0: .4byte gTextBox
_080622E4:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _080622F2
_080622EE:
@ -912,27 +912,27 @@ sub_08062788: @ 0x08062788
ldr r1, _080627D0 @ =0x0000060B
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _080627D4 @ =0x0000060C
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _080627D8 @ =0x0000060D
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _080627DC @ =0x0000064B
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _080627E0 @ =0x0000064C
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
ldr r1, _080627E4 @ =0x0000064D
adds r0, r4, #0
movs r2, #1
bl sub_0800015E
bl UpdateCollisionLayer
pop {r4, pc}
.align 2, 0
_080627CC: .4byte 0x00004072

2
asm/kingDaltus.s
View File

@ -173,7 +173,7 @@ sub_0806670C: @ 0x0806670C
sub_08066718: @ 0x08066718
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08066728
movs r0, #1

2
asm/librari.s
View File

@ -72,7 +72,7 @@ _0806B238:
b _0806B25C
_0806B24E:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806B25C
movs r0, #1

118
asm/mailbox.s
View File

@ -1,118 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080631E8
sub_080631E8: @ 0x080631E8
push {r4, lr}
adds r4, r0, #0
ldr r1, _0806320C @ =gUnk_0810C804
ldrb r0, [r4, #0xc]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
ldrb r0, [r4, #0xc]
cmp r0, #0
beq _08063208
adds r0, r4, #0
bl sub_0806ED78
_08063208:
pop {r4, pc}
.align 2, 0
_0806320C: .4byte gUnk_0810C804
thumb_func_start sub_08063210
sub_08063210: @ 0x08063210
push {lr}
movs r1, #1
strb r1, [r0, #0xc]
movs r1, #0
bl LoadAnimation
pop {pc}
.align 2, 0
thumb_func_start sub_08063220
sub_08063220: @ 0x08063220
push {lr}
adds r2, r0, #0
adds r0, #0x39
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0
beq _08063238
movs r0, #2
strb r0, [r2, #0xc]
movs r1, #8
b _0806323A
_08063238:
movs r1, #0
_0806323A:
adds r0, r2, #0
adds r0, #0x58
ldrb r0, [r0]
cmp r0, r1
beq _0806324C
adds r0, r2, #0
bl LoadAnimation
b _08063252
_0806324C:
adds r0, r2, #0
bl sub_08063280
_08063252:
pop {pc}
thumb_func_start sub_08063254
sub_08063254: @ 0x08063254
push {r4, lr}
adds r4, r0, #0
bl sub_08063280
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _08063274
movs r0, #3
strb r0, [r4, #0xc]
movs r0, #0
bl TextboxTryNoOverlap
_08063274:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08063278
sub_08063278: @ 0x08063278
push {lr}
bl sub_08063280
pop {pc}
thumb_func_start sub_08063280
sub_08063280: @ 0x08063280
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
adds r3, r4, #0
adds r3, #0x5a
ldrb r2, [r3]
movs r1, #0x7f
ands r1, r2
adds r0, r1, #0
eors r0, r2
strb r0, [r3]
cmp r1, #2
bne _080632A6
adds r0, r4, #0
movs r1, #0x31
movs r2, #0
bl CreateFX
_080632A6:
pop {r4, pc}

2
asm/malon.s
View File

@ -129,7 +129,7 @@ _080658FC:
sub_08065900: @ 0x08065900
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08065910
movs r0, #1

2
asm/mama.s
View File

@ -83,7 +83,7 @@ _0806C420:
b _0806C450
_0806C436:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806C450
movs r0, #1

2
asm/mayorHagen.s
View File

@ -80,7 +80,7 @@ _0806CE28:
b _0806CE58
_0806CE3E:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806CE58
movs r0, #1

4
asm/melari.s
View File

@ -161,7 +161,7 @@ _080687EA:
b _0806880E
_08068800:
adds r0, r5, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806880E
movs r0, #1
@ -205,7 +205,7 @@ _0806885E:
adds r0, r5, #0
movs r1, #0x3d
movs r2, #0x20
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _0806887A

2
asm/ministerPotho.s
View File

@ -168,7 +168,7 @@ _080668D4:
b _080668EC
_080668DE:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _080668EC
movs r0, #1

6
asm/mountainMinish.s
View File

@ -245,7 +245,7 @@ _08067FF2:
_08067FFC: .4byte gTextBox
_08068000:
adds r0, r5, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806801A
movs r0, #1
@ -312,7 +312,7 @@ _0806807E:
adds r0, r5, #0
movs r1, #4
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _080680A8
@ -332,7 +332,7 @@ _080680A8:
adds r0, r5, #0
movs r1, #0x3d
movs r2, #0x20
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _080680D2

2
asm/mutoh.s
View File

@ -81,7 +81,7 @@ _08067064:
b _0806707C
_0806706E:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806707C
movs r0, #1

2
asm/nayru.s
View File

@ -69,7 +69,7 @@ _08064900:
b _08064924
_0806490A:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08064924
movs r0, #1

4
asm/percy.s
View File

@ -101,7 +101,7 @@ _0806B436:
adds r0, r4, #0
movs r1, #0x25
movs r2, #0
bl CreateFX
bl CreateFx
_0806B462:
adds r0, r4, #0
bl sub_0807DD50
@ -160,7 +160,7 @@ _0806B4D4:
b _0806B4EC
_0806B4DE:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806B4EC
movs r0, #1

2
asm/pina.s
View File

@ -216,7 +216,7 @@ _08063BE0:
b _08063C10
_08063BF6:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08063C10
movs r0, #1

4
asm/postman.s
View File

@ -150,7 +150,7 @@ sub_080604DC: @ 0x080604DC
adds r0, r5, #0
movs r1, #0x11
movs r2, #0x40
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08060524
@ -283,7 +283,7 @@ _08060618:
adds r0, r4, #0
bl sub_080042B8
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
adds r5, r4, #0
adds r5, #0x6a
adds r6, r4, #0

2
asm/sittingPerson.s
View File

@ -133,7 +133,7 @@ _0806382E:
sub_08063830: @ 0x08063830
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806384C
movs r0, #1

4
asm/smith.s
View File

@ -106,7 +106,7 @@ _0806606E:
adds r0, r4, #0
movs r1, #0x3d
movs r2, #0x20
bl CreateFX
bl CreateFx
ldr r4, _080660A4 @ =gUnk_08110380
bl Random
movs r1, #7
@ -319,7 +319,7 @@ sub_08066200: @ 0x08066200
sub_08066218: @ 0x08066218
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08066228
movs r0, #1

190
asm/stamp.s
View File

@ -1,190 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08062B98
sub_08062B98: @ 0x08062B98
push {lr}
adds r2, r0, #0
ldrb r1, [r2, #0x10]
movs r0, #2
ands r0, r1
cmp r0, #0
beq _08062BBC
ldr r0, _08062BB8 @ =gUnk_0810C2DC
ldrb r1, [r2, #0xc]
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r2, #0
bl _call_via_r1
b _08062BCC
.align 2, 0
_08062BB8: .4byte gUnk_0810C2DC
_08062BBC:
ldr r0, _08062BD0 @ =gUnk_0810C2CC
ldrb r1, [r2, #0xc]
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r2, #0
bl _call_via_r1
_08062BCC:
pop {pc}
.align 2, 0
_08062BD0: .4byte gUnk_0810C2CC
thumb_func_start sub_08062BD4
sub_08062BD4: @ 0x08062BD4
push {r4, lr}
adds r4, r0, #0
movs r2, #1
movs r0, #1
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x18]
subs r0, #5
ands r0, r1
orrs r0, r2
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
adds r0, r4, #0
bl sub_08078778
pop {r4, pc}
thumb_func_start sub_08062BF8
sub_08062BF8: @ 0x08062BF8
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
adds r1, r4, #0
adds r1, #0x39
movs r0, #0
ldrsb r0, [r1, r0]
cmp r0, #0
beq _08062C1C
movs r0, #0
strb r0, [r1]
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
adds r0, r4, #0
bl sub_0805E47C
_08062C1C:
adds r0, r4, #0
bl sub_0806ED78
pop {r4, pc}
thumb_func_start sub_08062C24
sub_08062C24: @ 0x08062C24
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _08062C4E
adds r0, r4, #0
movs r1, #4
bl UpdateSprite
ldr r0, _08062C50 @ =0x00000A01
bl TextboxTryNoOverlap
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
_08062C4E:
pop {r4, pc}
.align 2, 0
_08062C50: .4byte 0x00000A01
thumb_func_start sub_08062C54
sub_08062C54: @ 0x08062C54
push {r4, lr}
adds r4, r0, #0
ldr r0, _08062C78 @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
cmp r0, #0
bne _08062C76
movs r0, #1
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
adds r0, r4, #0
bl sub_0805E584
_08062C76:
pop {r4, pc}
.align 2, 0
_08062C78: .4byte gTextBox
thumb_func_start sub_08062C7C
sub_08062C7C: @ 0x08062C7C
push {r4, lr}
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xc]
adds r0, r4, #0
bl sub_0807DD64
adds r0, r4, #0
movs r1, #0
bl UpdateSprite
adds r0, r4, #0
movs r1, #0x25
movs r2, #0
bl CreateFX
adds r0, r4, #0
bl sub_08062CA4
pop {r4, pc}
thumb_func_start sub_08062CA4
sub_08062CA4: @ 0x08062CA4
push {r4, lr}
adds r4, r0, #0
movs r1, #0
bl sub_0807DDAC
adds r0, r4, #0
bl sub_0807DDE4
adds r0, r4, #0
bl sub_08004274
pop {r4, pc}
thumb_func_start sub_08062CBC
sub_08062CBC: @ 0x08062CBC
push {r4, lr}
adds r4, r0, #0
movs r0, #0x2c
bl sub_0801E7F4
rsbs r1, r0, #0
orrs r1, r0
lsrs r1, r1, #0x1f
lsls r1, r1, #3
ldr r0, _08062CDC @ =gUnk_0810C2E4
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806F1AC
pop {r4, pc}
.align 2, 0
_08062CDC: .4byte gUnk_0810C2E4
thumb_func_start sub_08062CE0
sub_08062CE0: @ 0x08062CE0
push {lr}
adds r1, r0, #0
ldrb r0, [r1, #0xc]
cmp r0, #0
bne _08062CEE
movs r0, #1
strb r0, [r1, #0xc]
_08062CEE:
pop {pc}

4
asm/sturgeon.s
View File

@ -54,7 +54,7 @@ _08064AE4:
cmp r3, #0
beq _08064B00
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08064B42
movs r0, #1
@ -233,7 +233,7 @@ _08064C4C: .4byte gTextBox
sub_08064C50: @ 0x08064C50
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08064C68
movs r0, #1

2
asm/talon.s
View File

@ -187,7 +187,7 @@ _0806567E:
sub_08065680: @ 0x08065680
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _080656A0
adds r0, r4, #0

2
asm/teachers.s
View File

@ -92,7 +92,7 @@ _0806C64C:
b _0806C670
_0806C656:
adds r0, r5, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806C670
movs r0, #1

6
asm/tingleSiblings.s
View File

@ -144,7 +144,7 @@ _08064E4C:
b _08064E6A
_08064E56:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08064E6A
movs r0, #1
@ -169,7 +169,7 @@ _08064E6A:
_08064E86:
adds r0, r4, #0
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _08064EA0
@ -242,7 +242,7 @@ sub_08064EE8: @ 0x08064EE8
_08064F0C:
adds r0, r4, #0
movs r2, #0
bl CreateFX
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _08064F26

2
asm/townMinish.s
View File

@ -277,7 +277,7 @@ _0806ADCE:
_0806ADD8: .4byte gTextBox
_0806ADDC:
adds r0, r4, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806ADEA
movs r0, #1

4
asm/townsperson.s
View File

@ -365,7 +365,7 @@ _08061E4C: .4byte gTextBox
sub_08061E50: @ 0x08061E50
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _08061E6C
movs r0, #1
@ -544,7 +544,7 @@ sub_08061F94: @ 0x08061F94
adds r4, r0, #0
movs r1, #0x35
movs r2, #0
bl CreateFX
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08061FAC

2
asm/windTribespeople.s
View File

@ -124,7 +124,7 @@ _0806C858: .4byte gTextBox
sub_0806C85C: @ 0x0806C85C
push {r4, lr}
adds r4, r0, #0
bl sub_0806F148
bl UpdateFuseInteraction
cmp r0, #0
beq _0806C86C
movs r0, #1

32
data/data_8.s
View File

@ -28417,10 +28417,10 @@ gUnk_0810C2A5:: @ 0810C2A5
gUnk_0810C2B2:: @ 0810C2B2
.incbin "baserom.gba", 0x10C2B2, 0x000001A
gUnk_0810C2CC:: @ 0810C2CC
gStampBehaviors1:: @ 0810C2CC
.incbin "baserom.gba", 0x10C2CC, 0x0000010
gUnk_0810C2DC:: @ 0810C2DC
gStampBehaviors2:: @ 0810C2DC
.incbin "baserom.gba", 0x10C2DC, 0x0000008
gUnk_0810C2E4:: @ 0810C2E4
@ -28567,7 +28567,7 @@ gUnk_0810C7C9:: @ 0810C7C9
gUnk_0810C7D4:: @ 0810C7D4
.incbin "baserom.gba", 0x10C7D4, 0x0000030
gUnk_0810C804:: @ 0810C804
gMailboxBehaviors:: @ 0810C804
.incbin "baserom.gba", 0x10C804, 0x0000010
gUnk_0810C814:: @ 0810C814
@ -29521,7 +29521,7 @@ gUnk_081100E4:: @ 081100E4
gUnk_08110110:: @ 08110110
.incbin "baserom.gba", 0x110110, 0x0000008
gUnk_08110118:: @ 08110118
gMilkCartBehaviors:: @ 08110118
.incbin "baserom.gba", 0x110118, 0x0000008
gUnk_08110120:: @ 08110120
@ -34027,43 +34027,43 @@ gUnk_081206B4:: @ 081206B4
gUnk_081206C4:: @ 081206C4
.incbin "baserom.gba", 0x1206C4, 0x000000C
gUnk_081206D0:: @ 081206D0
gGreatFairy:: @ 081206D0
.incbin "baserom.gba", 0x1206D0, 0x000002C
gUnk_081206FC:: @ 081206FC
gGreatFairyBehaviors:: @ 081206FC
.incbin "baserom.gba", 0x1206FC, 0x0000018
gUnk_08120714:: @ 08120714
gGreatFairyRippleOffsets:: @ 08120714
.incbin "baserom.gba", 0x120714, 0x0000014
gUnk_08120728:: @ 08120728
gGreatFairyWings:: @ 08120728
.incbin "baserom.gba", 0x120728, 0x000000C
gUnk_08120734:: @ 08120734
.incbin "baserom.gba", 0x120734, 0x0000008
gUnk_0812073C:: @ 0812073C
gGreatFairyWake:: @ 0812073C
.incbin "baserom.gba", 0x12073C, 0x000000C
gUnk_08120748:: @ 08120748
gGreatFairyMiniAnim:: @ 08120748
.incbin "baserom.gba", 0x120748, 0x0000010
gUnk_08120758:: @ 08120758
gGreatFairyDrip:: @ 08120758
.incbin "baserom.gba", 0x120758, 0x0000008
gUnk_08120760:: @ 08120760
gGreatFairyRipple:: @ 08120760
.incbin "baserom.gba", 0x120760, 0x0000008
gUnk_08120768:: @ 08120768
gGreatFairyBigRipple:: @ 08120768
.incbin "baserom.gba", 0x120768, 0x0000008
gUnk_08120770:: @ 08120770
gGreatFairyEnergy:: @ 08120770
.incbin "baserom.gba", 0x120770, 0x0000008
gUnk_08120778:: @ 08120778
gGreatFairyInteract1:: @ 08120778
.incbin "baserom.gba", 0x120778, 0x0000010
gUnk_08120788:: @ 08120788
gGreatFairyInteract2:: @ 08120788
.incbin "baserom.gba", 0x120788, 0x0000014
gUnk_0812079C:: @ 0812079C

16
include/cutscene.h Normal file
View File

@ -0,0 +1,16 @@
#ifndef CUTSCENE_H
#define CUTSCENE_H
#include "global.h"
typedef struct {
u32 *cutsceneData;
u8 textIndex;
u8 filler[11];
u16 pauseTime;
u8 filler[2];
s32 targetX;
s32 targetY;
} CutsceneBehavior;
#endif

35
include/entity.h
View File

@ -19,7 +19,9 @@ typedef struct {
union SplitWord {
s32 WORD;
struct {
s16 LO, HI;
} HALF;
};
typedef struct
@ -39,11 +41,23 @@ typedef struct
u8 direction;
u8 possibleBool;
u8 field_0x17;
u8 shadowSize;
union {
u8 raw;
struct {
u8 ss0:2;
u8 ss2:1;
u8 ss3:1;
u8 ss4:1;
u8 ss5:1;
u8 ss6:1;
u8 ss7:1;
} __attribute__((packed)) b;
} __attribute__((packed)) spriteSettings;
u8 spriteOrder;
u8 palette;
u8 spriteOrientation[3];
u16 spritePointer;
u8 animationList;
u8 field_1f;
u16 field_0x20;
s16 nonPlanarMovement;
u8 spriteAnimation[3];
@ -53,7 +67,7 @@ typedef struct
union SplitWord y;
union SplitWord height; // todo
u8 collisionLayer;
u8 field_0x39;
s8 interactType;
u8 field_0x3a;
u8 flags2;
u8 field_0x3c;
@ -76,8 +90,13 @@ typedef struct
u32 * attachedEntity;
u8 field_0x58;
u8 field_0x59;
u8 frames;
u8 spriteOrientation2;
union {
u8 all;
u8 f0:6;
u8 f1:1;
u8 f2:1;
} __attribute__((packed)) frames;
u8 gfx;
u8 field_0x5c;
u8 field_0x5d;
u8 field_0x5e;
@ -92,9 +111,11 @@ typedef struct
u8 filler3[2];
u16 itemCooldown;
u32 field_0x7c;
UnkStruct *unkStruct;
u32 *field_0x84;
u32 field_0x80;
u16 cutsceneBeh;
u16 field_0x86;
} Entity;
#endif

11
linker.ld
View File

@ -376,12 +376,12 @@ SECTIONS {
asm/townsperson.o(.text);
asm/kid.o(.text);
asm/npc9.o(.text);
asm/stamp.o(.text);
src/stamp.o(.text);
asm/marcy.o(.text);
asm/wheaton.o(.text);
asm/pita.o(.text);
asm/minishEzlo.o(.text);
asm/mailbox.o(.text);
src/mailbox.o(.text);
asm/beedle.o(.text);
asm/brocco.o(.text);
asm/sittingPerson.o(.text);
@ -397,7 +397,7 @@ SECTIONS {
asm/talon.o(.text);
asm/malon.o(.text);
asm/epona.o(.text);
asm/cartOfLonLonMilk.o(.text);
src/milkCart.o(.text);
asm/ghostBrothers.o(.text);
asm/smith.o(.text);
asm/npc23.o(.text);
@ -436,7 +436,7 @@ SECTIONS {
asm/simon.o(.text);
asm/anju.o(.text);
asm/mama.o(.text);
asm/emma.o(.text);
src/emma.o(.text);
asm/teachers.o(.text);
asm/windTribespeople.o(.text);
asm/gregal.o(.text);
@ -482,6 +482,9 @@ SECTIONS {
asm/code_0807CC3C.o(.text);
src/room.o(.text);
asm/code_08080974.o(.text);
src/greatFairy.o(.text);
asm/greatFairy.o(.text);
asm/code_080874A0.o(.text);
asm/fastTravel.o(.text);
asm/code_0809D498.o(.text);
asm/sub_080A2838.o(.text);

46
src/emma.c Normal file
View File

@ -0,0 +1,46 @@
#include "global.h"
#include "entity.h"
extern u32 gUnk_0813AD10;
extern u32 gUnk_0813AD24;
extern u32 gUnk_0813AD38;
extern void sub_0805E3A0(Entity *, u32);
extern void sub_0807DD50(Entity *);
extern void sub_0807DD94(Entity *, u32);
extern void sub_08080840(u32 *);
void sub_0806C550(Entity *param_1)
{
if (param_1->action == 0) {
param_1->action += 1;
sub_0805E3A0(param_1,2);
sub_0807DD50(param_1);
}
else {
sub_0807DD94(param_1,0);
}
return;
}
void sub_0806C578(void)
{
sub_08080840(&gUnk_0813AD10);
return;
}
void sub_0806C588(void)
{
sub_08080840(&gUnk_0813AD24);
return;
}
void FUN_0806c598(void)
{
sub_08080840(&gUnk_0813AD38);
return;
}

54
src/greatFairy.c Normal file
View File

@ -0,0 +1,54 @@
#include "global.h"
#include "entity.h"
#include "room.h"
extern u32 __modsi3(u32, u32);
extern void UpdateSprite(Entity *, u32);
extern void sub_08087380();
extern u32 sub_0807CC3C();
extern Entity *sub_080873AC(Entity*, u32, u32);
extern void PositionRelative();
extern void (*gGreatFairy[11])(Entity*);
extern void (*gGreatFairyBehaviors[6])(Entity*);
extern u32 gUnk_0810C2E4;
extern RoomControls gRoomControls;
extern Entity gLinkEntity;
extern s16 gGreatFairyRippleOffsets[10];
void sub_08086A90(Entity *ent)
{
u8 bVar1;
if (ent->action == 0) {
bVar1 = __modsi3((ent->entityType).parameter1, 11);
(ent->entityType).parameter2 = bVar1;
}
gGreatFairy[(ent->entityType).parameter2](ent);
}
void sub_08086ABC(Entity *ent)
{
gGreatFairyBehaviors[ent->action](ent);
if ((gLinkEntity.y.HALF.HI - gRoomControls.roomOriginY) < 168) {
gRoomControls.cameraTarget = ent;
gRoomControls.unk5 = 2;
}
else {
gRoomControls.cameraTarget = &gLinkEntity;
gRoomControls.unk5 = 2;
}
}
void sub_08086AF8(Entity *ent)
{
sub_08087380();
ent->parameter3 = 0;
ent->cutsceneBeh = 290;
return;
}

82
src/mailbox.c Normal file
View File

@ -0,0 +1,82 @@
#include "global.h"
#include "entity.h"
extern void sub_0806ED78(Entity *);
extern void LoadAnimation();
extern void sub_08063280();
extern void TextboxTryNoOverlap(u32);
extern void sub_080042B8();
extern void CreateFx();
extern void (*gMailboxBehaviors[4])(Entity *);
void sub_080631E8(Entity *ent)
{
gMailboxBehaviors[ent->action](ent);
if (ent->action != 0) {
sub_0806ED78(ent);
}
}
void sub_08063210(Entity *ent)
{
ent->action = 1;
LoadAnimation(ent, 0);
return;
}
void sub_08063220(Entity *ent)
{
u8 bVar1;
if (ent->interactType != 0) {
ent->action = 2;
bVar1 = 8;
}
else {
bVar1 = 0;
}
if (ent->field_0x58 != bVar1) {
LoadAnimation(ent);
}
else {
sub_08063280(ent, bVar1);
}
}
void sub_08063254(Entity *ent)
{
sub_08063280(ent);
if ((ent->frames.all & 0x80) != 0) {
ent->action = 3;
TextboxTryNoOverlap(0);
}
return;
}
void sub_08063278(Entity *ent)
{
sub_08063280(ent);
return;
}
void sub_08063280(Entity *ent)
{
Entity *e; // r4@1
u8 var; // r2@1
e = ent;
sub_080042B8();
var = e->frames.all & 0x7F;
e->frames.all = e->frames.all ^ var;
if ( var == 2 )
CreateFx(e, 49, 0);
}

31
src/milkCart.c Normal file
View File

@ -0,0 +1,31 @@
#include "global.h"
#include "entity.h"
extern void _call_via_r1(Entity *, u32);
extern void sub_0806ED78();
extern void LoadAnimation();
extern void sub_080042B8();
extern void (*gMilkCartBehaviors[2])(Entity*);
void sub_08065B4C(Entity *ent)
{
gMilkCartBehaviors[ent->action](ent);
sub_0806ED78(ent);
}
void sub_08065B6C(Entity *ent)
{
ent->action++;
ent->spriteSettings.b.ss0 = 1;
(ent->y).HALF.LO += -32768;
ent->animationState = 6;
LoadAnimation(ent, 3);
}
void sub_08065B9C(Entity *ent)
{
sub_080042B8(ent);
}

15
src/ocarina.c
View File

@ -15,29 +15,32 @@ extern void UnfreezeTime(void);
extern Entity gLinkEntity;
extern LinkState gLinkState;
extern void gOcarinaStates;
extern void (*gOcarinaStates[4])(ItemBehavior *, u32);
extern u8 gUnk_02034490;
void Ocarina(ItemBehavior *pItemBeh,u32 inputFlags)
{
u32 *ocarinaStates = &gOcarinaStates;
_call_via_r2(pItemBeh, inputFlags,(ocarinaStates)[pItemBeh->stateID]);
//u32 *ocarinaStates = &gOcarinaStates;
//_call_via_r2(pItemBeh, inputFlags,(ocarinaStates)[pItemBeh->stateID]);
gOcarinaStates[pItemBeh->stateID](pItemBeh, inputFlags);
gLinkEntity.itemCooldown = gLinkEntity.itemCooldown + 1;
}
void OcarinaUse(ItemBehavior *itemBeh,s32 inputFlags)
{
u32 bVar1;
u32 var;
if (gLinkState.linkAction == 24) {
sub_08077E78(itemBeh,inputFlags);
}
else {
itemBeh->unk4 = itemBeh->unk4 | 15;
itemBeh->unk4 |= 15;
gLinkEntity.animationState = 4;
gLinkEntity.shadowSize = gLinkEntity.animationState & (gLinkEntity.shadowSize - 0x45);
var = gLinkEntity.spriteSettings.raw & ~0x40;
gLinkEntity.spriteSettings.raw &= var;
gLinkEntity.flags = gLinkEntity.flags & 127;
gLinkEntity.itemCooldown = 2;
gLinkState.flags.all = (gLinkState.flags.all | 0x10000000);

126
src/stamp.c Normal file
View File

@ -0,0 +1,126 @@
#include "global.h"
#include "entity.h"
#include "textbox.h"
extern void UpdateSprite(Entity *, u32);
extern void sub_08078778(Entity *);
extern void sub_0805E47C(Entity *);
extern void sub_08004274(Entity *);
extern void sub_0806ED78(Entity *);
extern void TextboxTryNoOverlap(u32);
extern void sub_0805E584();
extern void sub_0807DD64();
extern void CreateFx();
extern void sub_08062CA4();
extern void sub_0807DDAC();
extern void sub_0807DDE4();
extern u32 sub_0801E7F4();
extern void sub_0806F1AC();
extern void (*gStampBehaviors1[4])(Entity*);
extern void (*gStampBehaviors2[2])(Entity*);
extern TextBox gTextBox;
extern u32 gUnk_0810C2E4;
extern void UpdateSprite(Entity *, u32);
extern void sub_08078778(Entity *);
extern void sub_0805E47C(Entity *);
extern void sub_08004274(Entity *);
extern void sub_0806ED78(Entity *);
extern void TextboxTryNoOverlap(u32);
extern void sub_0805E584();
extern void sub_0807DD64();
extern void CreateFx();
extern void sub_08062CA4();
extern void sub_0807DDAC();
extern void sub_0807DDE4();
extern u32 sub_0801E7F4();
extern void sub_0806F1AC();
extern void (*gStampBehaviors1[4])(Entity*);
extern void (*gStampBehaviors2[2])(Entity*);
extern TextBox gTextBox;
extern u32 gUnk_0810C2E4;
void sub_08062B98(Entity *ent)
{
if ((ent->flags & 2) != 0) {
gStampBehaviors2[ent->action](ent);
}
else {
gStampBehaviors1[ent->action](ent);
}
}
void sub_08062BD4(Entity *ent)
{
ent->action = 1;
ent->spriteSettings.b.ss0 = 1;
UpdateSprite(ent, 0);
sub_08078778(ent);
}
void sub_08062BF8(Entity *ent)
{
sub_08004274(ent);
if (ent->interactType != 0) {
ent->interactType = 0;
ent->action++;
sub_0805E47C(ent);
}
sub_0806ED78(ent);
}
void sub_08062C24(Entity *ent)
{
sub_08004274(ent);
if ((ent->frames.all & 128) != 0) {
UpdateSprite(ent, 4);
TextboxTryNoOverlap(2561);
ent->action++;
}
}
void sub_08062C54(Entity *ent)
{
if ((gTextBox.doTextBox & 127) == 0) {
ent->action = 1;
UpdateSprite(ent, 0);
sub_0805E584(ent);
}
}
void sub_08062C7C(Entity *ent)
{
ent->action = 1;
sub_0807DD64(ent);
UpdateSprite(ent, 0);
CreateFx(ent, 37, 0);
sub_08062CA4(ent);
}
void sub_08062CA4(Entity *ent)
{
sub_0807DDAC(ent, 0);
sub_0807DDE4(ent);
sub_08004274(ent);
}
void sub_08062CBC(Entity *ent)
{
u32 uVar1;
uVar1 = sub_0801E7F4(44);
sub_0806F1AC(ent, &gUnk_0810C2E4 + ((-uVar1 | uVar1) >> 31) * 2);
}
void sub_08062CE0(Entity *ent)
{
if (ent->action == 0) {
ent->action = 1;
}
}

4
src/textbox.c
View File

@ -44,8 +44,8 @@ void TextboxNoOverlap(u32 index,Entity *ent)
ShowTextbox(index);
y = *(&ent->y.HI + 1);
h = *(&ent->height.HI + 1);
y = ent->y.HALF.HI;
h = ent->height.HALF.HI;
if (88 < ((y + h) - gRoomControls.roomScrollY)) {
gTextBox.textWindowPosY = 1;