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

Merge pull request #6 from zeldaret/master

Browse Source 
Update
This commit is contained in:
Macrepeh
2021-02-28 21:20:34 -05:00
committed by GitHub
parent b6e1b5ca40 082b0c03a3
commit 2ad520100d
319 changed files with 2607 additions and 2685 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/beanstalk.s
+2 -2
View File
@@ -349,7 +349,7 @@ sub_08089F70: @ 0x08089F70
strb r0, [r4, #0xe]
movs r0, #0xcc
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08089F8E:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
@@ -416,7 +416,7 @@ sub_08089FF0: @ 0x08089FF0
strb r0, [r1, #0xe]
movs r0, #0xcc
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0808A00E:
pop {pc}
asm/bigBarrel.s
+4 -4
View File
@@ -96,7 +96,7 @@ _08088AE4:
ldr r0, _08088B74 @ =gUnk_08120C1C
str r0, [r4, #0x68]
movs r0, #0x8a
bl PlaySFX
bl SoundReq
_08088B06:
ldr r1, [r5, #0x68]
movs r0, #2
@@ -111,7 +111,7 @@ _08088B06:
ldr r0, _08088B78 @ =gUnk_08120C25
str r0, [r4, #0x68]
movs r0, #0x89
bl PlaySFX
bl SoundReq
_08088B24:
ldr r1, [r5, #0x68]
movs r0, #4
@@ -126,7 +126,7 @@ _08088B24:
ldr r0, _08088B7C @ =gUnk_08120C2E
str r0, [r4, #0x68]
movs r0, #0x8a
bl PlaySFX
bl SoundReq
_08088B42:
ldrb r0, [r4, #0xe]
cmp r0, #0
@@ -817,7 +817,7 @@ _0808905C:
movs r1, #0x3c
bl sub_0805E4E0
movs r0, #0x72
bl PlaySFX
bl SoundReq
_08089088:
adds r0, r4, #0
bl DeleteEntity
asm/bigGoron.s
+1 -1
View File
@@ -95,7 +95,7 @@ sub_0806D0B0: @ 0x0806D0B0
movs r1, #0x80
lsls r1, r1, #6
adds r0, r5, #0
bl _DmaZero
bl MemClear32
cmp r4, #0
beq _0806D0DA
adds r0, r4, #0
asm/bird.s
+2 -2
View File
@@ -89,7 +89,7 @@ _0809D234:
movs r1, #0
bl InitAnimationForceUpdate
ldr r0, _0809D2AC @ =0x00000123
bl PlaySFX
bl SoundReq
movs r0, #0x68
adds r0, r0, r5
mov r8, r0
@@ -392,7 +392,7 @@ sub_0809D498: @ 0x0809D498
ldrh r0, [r0, #0x32]
strh r0, [r5, #0x32]
ldr r0, _0809D544 @ =0x00000123
bl PlaySFX
bl SoundReq
ldrb r1, [r6]
movs r0, #0x39
rsbs r0, r0, #0
asm/bossDoor.s
+2 -2
View File
@@ -203,7 +203,7 @@ sub_0808C348: @ 0x0808C348
cmp r0, #0
bne _0808C36A
ldr r0, _0808C378 @ =0x00000185
bl PlaySFX
bl SoundReq
_0808C36A:
adds r0, r4, #0
bl GetNextFrame
@@ -408,7 +408,7 @@ sub_0808C4BC: @ 0x0808C4BC
strh r1, [r0, #0x32]
bl sub_0808C5D0
ldr r0, _0808C4FC @ =0x0000010B
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_0808C4F8: .4byte gUnk_0812150C
asm/bowUse.s
+1 -1
View File
@@ -173,7 +173,7 @@ _080192C6:
str r0, [r4, #0x30]
movs r0, #0xc5
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_080192D0:
adds r5, r4, #0
adds r5, #0x41
asm/cat.s
+1 -1
View File
@@ -697,7 +697,7 @@ _08067D12:
movs r0, #0
strb r0, [r5]
movs r0, #0xd2
bl PlaySFX
bl SoundReq
_08067D1C:
pop {r4, r5, pc}
.align 2, 0
asm/chestSpawner.s
+6 -6
View File
@@ -195,7 +195,7 @@ _08083FB2:
strb r1, [r4, #0xf]
movs r0, #0xa5
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _08083FE6
.align 2, 0
_08083FC8: .4byte gPlayerEntity
@@ -210,7 +210,7 @@ _08083FCC:
adds r0, r4, #0
bl sub_08083E20
movs r0, #0x73
bl PlaySFX
bl SoundReq
_08083FE6:
pop {r4, r5, pc}
.align 2, 0
@@ -238,7 +238,7 @@ sub_08083FEC: @ 0x08083FEC
movs r1, #0x3c
bl sub_0805E4E0
ldr r0, _08084020 @ =0x0000011B
bl PlaySFX
bl SoundReq
_0808401E:
pop {r4, pc}
.align 2, 0
@@ -381,7 +381,7 @@ sub_080840A8: @ 0x080840A8
beq _08084138
movs r0, #0x92
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08084138:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -524,13 +524,13 @@ sub_08084224: @ 0x08084224
cmp r0, #6
blt _0808424C
ldr r0, _08084248 @ =0x00000215
bl PlaySFX
bl SoundReq
b _08084258
.align 2, 0
_08084248: .4byte 0x00000215
_0808424C:
movs r0, #0x72
bl PlaySFX
bl SoundReq
adds r0, r4, #0
bl CreateDust
_08084258:
asm/chuchuBoss.s
+19 -19
View File
@@ -88,7 +88,7 @@ _08025D28:
strb r3, [r0]
movs r0, #0x94
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
adds r0, r4, #0
bl sub_0804A7D4
b _08025D9C
@@ -221,7 +221,7 @@ _08025E68:
_08025E6E:
ldr r4, [r5, #0x48]
adds r0, r5, #0
bl sub_0806FBD8
bl AllocMutableHitbox
adds r1, r0, #0
cmp r1, #0
beq _08025E7E
@@ -234,14 +234,14 @@ _08025E7E:
_08025E86:
strb r0, [r5, #0xb]
movs r0, #0x10
bl sub_0801D8E0
bl zMalloc
adds r4, r5, #0
adds r4, #0x84
str r0, [r4]
cmp r0, #0
beq _08025EA2
adds r0, r5, #0
bl sub_0806FBD8
bl AllocMutableHitbox
cmp r0, #0
bne _08025EAA
_08025EA2:
@@ -1016,7 +1016,7 @@ sub_08026414: @ 0x08026414
strb r0, [r1, #3]
movs r0, #0xd1
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08026474:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -1035,7 +1035,7 @@ sub_0802647C: @ 0x0802647C
movs r1, #0
bl sub_08080964
ldr r0, _080264A8 @ =0x000001A1
bl PlaySFX
bl SoundReq
adds r0, r4, #0
adds r0, #0x84
ldr r1, [r0]
@@ -1090,7 +1090,7 @@ sub_080264D4: @ 0x080264D4
movs r2, #0
bl sub_080276F4
movs r0, #0x2e
bl PlaySFX
bl SoundReq
_08026504:
adds r0, r4, #0
bl sub_080277F8
@@ -1371,7 +1371,7 @@ _0802670A:
bne _08026726
movs r0, #0xcf
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08026726:
adds r0, r4, #0
bl ProcessMovement
@@ -1536,7 +1536,7 @@ _08026830:
bl sub_080276F4
movs r0, #0xd1
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08026860:
adds r0, r4, #0
bl sub_080277F8
@@ -1580,7 +1580,7 @@ _08026888:
movs r1, #3
bl InitAnimationForceUpdate
ldr r0, _080268C4 @ =0x000001A1
bl PlaySFX
bl SoundReq
_080268BE:
add sp, #4
pop {r4, r5, pc}
@@ -1853,7 +1853,7 @@ _08026A98:
movs r1, #0
bl sub_08080964
ldr r0, _08026B24 @ =0x0000010B
bl PlaySFX
bl SoundReq
adds r0, r6, #0
movs r1, #0x15
movs r2, #0
@@ -2035,7 +2035,7 @@ sub_08026BE8: @ 0x08026BE8
orrs r0, r1
strb r0, [r3]
ldr r0, _08026C30 @ =0x00000155
bl PlaySFX
bl SoundReq
b _08026C38
.align 2, 0
_08026C30: .4byte 0x00000155
@@ -2558,7 +2558,7 @@ _08026FFE:
movs r0, #0x2d
strb r0, [r1]
ldr r0, _08027044 @ =0x00000155
bl PlaySFX
bl SoundReq
ldrb r1, [r4, #0x15]
movs r0, #0x10
ands r0, r1
@@ -2617,7 +2617,7 @@ sub_08027064: @ 0x08027064
cmp r0, #0
bne _08027098
movs r0, #0x7c
bl PlaySFX
bl SoundReq
_08027098:
adds r0, r5, #0
adds r0, #0x84
@@ -3071,7 +3071,7 @@ _08027406:
beq _08027428
_0802741C:
ldr r0, _08027424 @ =0x00000127
bl PlaySFX
bl SoundReq
b _08027444
.align 2, 0
_08027424: .4byte 0x00000127
@@ -3087,7 +3087,7 @@ _08027428:
strb r0, [r2, #0xd]
movs r0, #0x94
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08027444:
adds r0, r6, #0
bl sub_08027A60
@@ -3965,14 +3965,14 @@ sub_08027AA4: @ 0x08027AA4
b _08027B94
_08027AC2:
movs r0, #0x84
bl PlaySFX
bl SoundReq
ldrb r3, [r5, #0xb]
adds r0, r5, #0
movs r1, #0x49
movs r2, #9
bl CreateObjectWithParent
ldr r0, _08027B3C @ =0x00000155
bl PlaySFX
bl SoundReq
adds r0, r5, #0
adds r0, #0x84
ldr r4, [r0]
@@ -4016,7 +4016,7 @@ _08027B2A:
adds r0, r5, #0
bl sub_08027D20
ldr r0, _08027B40 @ =0x00000127
bl PlaySFX
bl SoundReq
_08027B36:
movs r0, #1
b _08027B96
asm/code_08000E44.s
+2 -2
View File
@@ -59,8 +59,8 @@ sub_08000E92: @ 0x08000E92
movs r3, #1
b _08000E98
non_word_aligned_thumb_func_start LoadAssetAsync
LoadAssetAsync: @ 0x08000E96
non_word_aligned_thumb_func_start LoadResourceAsync
LoadResourceAsync: @ 0x08000E96
movs r3, #0
_08000E98:
push {r4, r5}
asm/code_080011C4.s
+5 -5
View File
@@ -5,15 +5,15 @@
.text
thumb_func_start sub_080011C4
sub_080011C4: @ 0x080011C4
thumb_func_start EnemyUpdate
EnemyUpdate: @ 0x080011C4
mov r3, lr
push {r3, r4}
adds r4, r0, #0
ldrb r2, [r0, #0xc]
cmp r2, #0
bne _080011DC
bl sub_0804A57C
bl EnemyInit
cmp r0, #0
bne _080011EA
bl DeleteThisEntity
@@ -41,7 +41,7 @@ _080011EA:
strb r2, [r4, r1]
_0800120A:
adds r0, r4, #0
bl sub_0800404C
bl DrawEntity
pop {r3, r4}
bx r3
@@ -1052,7 +1052,7 @@ gUnk_080026A4::
.4byte gUnk_03005FBC
.4byte gUnk_020000B0
.4byte gUnk_03003DA8
.4byte gUnk_03003DB8
.4byte gHitboxCount
.4byte gUnk_03005FBC
thumb_func_start sub_080026C4
asm/code_08003FC4.s
+3 -3
View File
@@ -86,8 +86,8 @@ _08004048:
movs r0, #0
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_0800404C
sub_0800404C: @ 0x0800404C
thumb_func_start DrawEntity
DrawEntity: @ 0x0800404C
push {r4, r5, lr}
adds r4, r0, #0
ldrb r1, [r0, #0x18]
@@ -123,7 +123,7 @@ _0800407E:
ldr r4, _08004360 @ =gUnk_02021F20
_0800408C:
ldrh r0, [r4]
bl PlaySFX
bl SoundReq
adds r4, #2
subs r5, #1
bne _0800408C
asm/code_080043E8.s
+1 -1
View File
@@ -106,7 +106,7 @@ sub_0800449C: @ 0x0800449C
cmp r0, #0
pop {r0}
beq _080044AC
bl PlaySFX
bl SoundReq
_080044AC:
pop {pc}
asm/code_08016B30.s
+7 -7
View File
@@ -49,11 +49,11 @@ sub_08016B6C: @ 0x08016B6C
strh r0, [r4, #0xa]
ldrh r0, [r4, #0xa]
bl m4aSoundVSync
ldr r5, _08016BC8 @ =gUnk_03001000
ldr r5, _08016BC8 @ =gMain
ldrb r0, [r5]
cmp r0, #0
bne _08016BA6
bl UpdateBackgroundRegisters
bl DispCtrlSet
ldr r0, _08016BCC @ =gUnk_03000FBC
str r0, [r4]
ldr r0, _08016BD0 @ =gUnk_02022730
@@ -78,14 +78,14 @@ _08016BA6:
_08016BBC: .4byte 0x040000B0
_08016BC0: .4byte 0x0000C5FF
_08016BC4: .4byte 0x00007FFF
_08016BC8: .4byte gUnk_03001000
_08016BC8: .4byte gMain
_08016BCC: .4byte gUnk_03000FBC
_08016BD0: .4byte gUnk_02022730
_08016BD4: .4byte 0x84000004
_08016BD8: .4byte 0x03007FF8
thumb_func_start sub_08016BDC
sub_08016BDC: @ 0x08016BDC
thumb_func_start HBlankIntr
HBlankIntr: @ 0x08016BDC
push {lr}
ldr r1, _08016BF0 @ =0x04000004
ldr r2, _08016BF4 @ =0x00005028
@@ -135,8 +135,8 @@ _08016C30: .4byte gUnk_02022730
_08016C34: .4byte 0x040000B0
_08016C38: .4byte 0x00003FFF
thumb_func_start sub_08016C3C
sub_08016C3C: @ 0x08016C3C
thumb_func_start UpdateDisplayControls
UpdateDisplayControls: @ 0x08016C3C
push {r4, lr}
ldr r2, _08016C94 @ =gUnk_03000000
ldrb r0, [r2]
asm/code_08018500.s
+2 -2
View File
@@ -58,7 +58,7 @@ sub_0801855C: @ 0x0801855C
ldr r4, _08018570 @ =gUnk_02033AB8
adds r0, r4, #0
movs r1, #0x14
bl _DmaZero
bl MemClear32
adds r5, r4, #0
ldr r4, _08018574 @ =gUnk_080B3D20
movs r6, #0
@@ -884,7 +884,7 @@ sub_08018BB4: @ 0x08018BB4
mov r5, sp
mov r1, sp
movs r2, #8
bl _DmaCopy
bl MemCopy
lsls r0, r4, #2
adds r0, r0, r4
lsls r0, r0, #2
asm/code_08019444.s
+11 -11
View File
@@ -163,7 +163,7 @@ _0801954E:
adds r0, r5, #0
bl sub_08019580
ldr r0, _0801957C @ =0x0000013F
bl PlaySFX
bl SoundReq
pop {r4, r5, pc}
.align 2, 0
_08019578: .4byte gUnk_080B43FC
@@ -495,7 +495,7 @@ _08019810:
_0801981A:
adds r0, r1, #0
adds r1, r3, #0
bl _DmaCopy
bl MemCopy
b _0801982E
_08019824:
ldrh r0, [r4]
@@ -3466,7 +3466,7 @@ _0801AE70:
movs r2, #0x80
lsls r2, r2, #4
movs r0, #0xf
bl _DmaFill16
bl MemFill16
movs r0, #1
rsbs r0, r0, #0
bl sub_0805BB74
@@ -3708,8 +3708,8 @@ _0801B054:
pop {r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_start sub_0801B060
sub_0801B060: @ 0x0801B060
thumb_func_start UpdateBgAnim
UpdateBgAnim: @ 0x0801B060
push {r4, r5, lr}
movs r3, #0
ldr r4, _0801B0B0 @ =gUnk_02000CC0
@@ -3815,7 +3815,7 @@ _0801B114:
adds r1, r3, r0
lsls r2, r2, #5
adds r0, r5, #0
bl _DmaCopy
bl MemCopy
_0801B122:
ldr r0, [r4]
cmp r0, #0
@@ -5093,7 +5093,7 @@ _0801BA54: @ jump table
.4byte _0801BB02 @ case 17
_0801BA9C:
adds r0, r4, #0
bl sub_0806FBD8
bl AllocMutableHitbox
cmp r0, #0
beq _0801BB26
ldrb r1, [r4, #0x10]
@@ -5130,7 +5130,7 @@ _0801BA9C:
bl sub_0801766C
movs r0, #0xee
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _0801BB0A
.align 2, 0
_0801BAF4: .4byte gPlayerEntity
@@ -5189,7 +5189,7 @@ sub_0801BB2C: @ 0x0801BB2C
movs r2, #5
bl sub_080A7C18
ldr r0, _0801BB8C @ =0x00000109
bl PlaySFX
bl SoundReq
_0801BB64:
bl DeleteThisEntity
_0801BB68:
@@ -5319,7 +5319,7 @@ _0801BC7A:
strh r0, [r1]
movs r0, #0x88
lsls r0, r0, #2
bl PlaySFX
bl SoundReq
_0801BC98:
adds r0, r5, #0
bl ModHealth
@@ -5413,7 +5413,7 @@ _0801BD54:
lsls r0, r0, #4
strh r0, [r1]
ldr r0, _0801BD8C @ =0x000001CF
bl PlaySFX
bl SoundReq
_0801BD6C:
ldr r0, _0801BD90 @ =gPlayerEntity
adds r0, #0x5a
asm/code_0801C370.s
+3 -3
View File
@@ -32,7 +32,7 @@ _0801C398:
movs r1, #0xcd
lsls r1, r1, #2
adds r0, r5, #0
bl _DmaZero
bl MemClear32
strb r6, [r5, #3]
strh r4, [r5, #0xe]
ldr r0, _0801C474 @ =gSave
@@ -48,7 +48,7 @@ _0801C398:
movs r1, #0x80
lsls r1, r1, #4
adds r0, r4, #0
bl _DmaZero
bl MemClear32
ldr r1, _0801C47C @ =gScreen
str r4, [r1, #0x10]
ldr r0, _0801C480 @ =0x00001F0C
@@ -93,7 +93,7 @@ _0801C398:
adds r0, #0x34
movs r1, #0xc0
lsls r1, r1, #2
bl _DmaZero
bl MemClear32
movs r0, #5
movs r1, #9
bl sub_0801CA6C
asm/code_0801CEC0.s
+3 -3
View File
@@ -12,7 +12,7 @@ sub_0801CFA8: @ 0x0801CFA8
adds r5, r0, #0
ldr r0, _0801CFCC @ =gUnk_02001A00
movs r1, #0x40
bl _DmaZero
bl MemClear32
movs r4, #0
_0801CFB6:
adds r0, r4, #0
@@ -467,7 +467,7 @@ sub_0801D2C8: @ 0x0801D2C8
lsls r1, r4, #5
adds r1, r1, r2
movs r2, #0x20
bl _DmaFill16
bl MemFill16
b _0801D33C
.align 2, 0
_0801D2F8: .4byte gUsedPalettes
@@ -730,7 +730,7 @@ _0801D4C8:
adds r1, r7, #0
movs r2, #0x20
str r3, [sp]
bl _DmaCopy
bl MemCopy
adds r6, #0x20
adds r4, #4
adds r7, #0x20
asm/code_0801D79C.s
+33 -33
View File
@@ -45,8 +45,8 @@ _0801D8C4:
_0801D8D8: .4byte 0x00007FFF
_0801D8DC: .4byte 0x040000D4
thumb_func_start sub_0801D8E0
sub_0801D8E0: @ 0x0801D8E0
thumb_func_start zMalloc
zMalloc: @ 0x0801D8E0
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
@@ -59,7 +59,7 @@ sub_0801D8E0: @ 0x0801D8E0
mov r1, ip
ands r1, r0
mov ip, r1
ldr r6, _0801D90C @ =gUnk_02035540
ldr r6, _0801D90C @ =gzHeap
mov sb, r6
ldrh r7, [r6]
movs r5, #1
@@ -70,7 +70,7 @@ sub_0801D8E0: @ 0x0801D8E0
movs r2, #0
b _0801D926
.align 2, 0
_0801D90C: .4byte gUnk_02035540
_0801D90C: .4byte gzHeap
_0801D910:
cmp r1, r4
bhi _0801D918
@@ -91,7 +91,7 @@ _0801D926:
lsls r0, r2, #2
add r0, sb
ldrh r1, [r0, #2]
ldr r6, _0801D95C @ =gUnk_02035540
ldr r6, _0801D95C @ =gzHeap
adds r1, r1, r6
ldrh r0, [r0, #4]
adds r0, r0, r6
@@ -117,7 +117,7 @@ _0801D952:
mov sl, r6
b _0801D970
.align 2, 0
_0801D95C: .4byte gUnk_02035540
_0801D95C: .4byte gzHeap
_0801D960:
movs r5, #0
_0801D962:
@@ -133,7 +133,7 @@ _0801D970:
lsls r0, r1, #2
add r0, sb
ldrh r0, [r0, #2]
ldr r6, _0801D994 @ =gUnk_02035540
ldr r6, _0801D994 @ =gzHeap
adds r3, r0, r6
mov r0, ip
subs r4, r3, r0
@@ -148,7 +148,7 @@ _0801D970:
movs r2, #0
b _0801D9AE
.align 2, 0
_0801D994: .4byte gUnk_02035540
_0801D994: .4byte gzHeap
_0801D998:
cmp r1, r4
bhi _0801D9A0
@@ -203,7 +203,7 @@ _0801D9D8:
strh r0, [r3]
adds r0, r4, #0
mov r1, ip
bl _DmaZero
bl MemClear32
adds r0, r4, #0
b _0801DA02
.align 2, 0
@@ -220,7 +220,7 @@ _0801DA02:
thumb_func_start sub_0801DA0C
sub_0801DA0C: @ 0x0801DA0C
push {r4, r5, lr}
ldr r3, _0801DA44 @ =gUnk_02035540
ldr r3, _0801DA44 @ =gzHeap
subs r1, r0, r3
ldr r0, _0801DA48 @ =0x00000FFF
cmp r1, r0
@@ -248,7 +248,7 @@ sub_0801DA0C: @ 0x0801DA0C
strh r0, [r3]
b _0801DA74
.align 2, 0
_0801DA44: .4byte gUnk_02035540
_0801DA44: .4byte gzHeap
_0801DA48: .4byte 0x00000FFF
_0801DA4C:
adds r4, #4
@@ -276,22 +276,22 @@ _0801DA74:
.align 2, 0
_0801DA78: .4byte gUnk_0203553E
thumb_func_start sub_0801DA7C
sub_0801DA7C: @ 0x0801DA7C
thumb_func_start zMallocInit
zMallocInit: @ 0x0801DA7C
push {lr}
ldr r0, _0801DA8C @ =gUnk_02035540
ldr r0, _0801DA8C @ =gzHeap
movs r1, #0x80
lsls r1, r1, #5
bl _DmaZero
bl MemClear32
pop {pc}
.align 2, 0
_0801DA8C: .4byte gUnk_02035540
_0801DA8C: .4byte gzHeap
thumb_func_start sub_0801DA90
sub_0801DA90: @ 0x0801DA90
push {r4, r5, lr}
adds r4, r0, #0
ldr r1, _0801DAEC @ =gUnk_03001000
ldr r1, _0801DAEC @ =gMain
ldrb r0, [r1]
movs r3, #0
movs r0, #1
@@ -323,15 +323,15 @@ sub_0801DA90: @ 0x0801DA90
bl sub_0801DB34
ldr r0, _0801DB08 @ =0x0600C000
movs r1, #0x20
bl _DmaZero
bl MemClear32
ldr r0, _0801DB0C @ =gBG0Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
strh r4, [r5, #0xe]
pop {r4, r5, pc}
.align 2, 0
_0801DAEC: .4byte gUnk_03001000
_0801DAEC: .4byte gMain
_0801DAF0: .4byte gUnk_03003DE0
_0801DAF4: .4byte gFadeControl
_0801DAF8: .4byte gScreen
@@ -369,7 +369,7 @@ sub_0801DB34: @ 0x0801DB34
ldr r4, _0801DB6C @ =gScreen
adds r0, r4, #0
movs r1, #0x7c
bl _DmaZero
bl MemClear32
ldr r0, _0801DB70 @ =gBG0Buffer
str r0, [r4, #0x10]
ldr r0, _0801DB74 @ =0x00001F0C
@@ -424,7 +424,7 @@ sub_0801DBA0: @ 0x0801DBA0
adds r5, r1, #0
adds r1, r2, #0
adds r0, r5, #0
bl _DmaZero
bl MemClear32
movs r0, #1
strb r0, [r5]
ldr r2, _0801DBE4 @ =gScreenTransition
@@ -667,7 +667,7 @@ sub_0801DD88: @ 0x0801DD88
ldr r1, _0801DD9C @ =0x06006000
movs r2, #0x80
lsls r2, r2, #6
bl LoadAssetAsync
bl LoadResourceAsync
pop {pc}
.align 2, 0
_0801DD98: .4byte gUnk_0201AEE0
@@ -699,7 +699,7 @@ _0801DDB8:
ldr r0, _0801DDE0 @ =gUnk_02019EE0
movs r1, #0x80
lsls r1, r1, #8
bl _DmaZero
bl MemClear32
b _0801DEE2
.align 2, 0
_0801DDD8: .4byte gUnk_080C9C50
@@ -968,7 +968,7 @@ sub_0801DFB4: @ 0x0801DFB4
ldr r7, _0801E004 @ =gUnk_02022740
adds r0, r7, #0
movs r1, #0x10
bl _DmaZero
bl MemClear32
strh r4, [r7, #6]
strh r5, [r7, #8]
strh r6, [r7, #0xa]
@@ -1049,7 +1049,7 @@ sub_0801E044: @ 0x0801E044
movs r1, #2
strb r1, [r0, #1]
movs r0, #0x6b
bl PlaySFX
bl SoundReq
_0801E06A:
pop {pc}
.align 2, 0
@@ -1209,7 +1209,7 @@ sub_0801E160: @ 0x0801E160
adds r0, r0, r4
movs r1, #0xa0
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
adds r0, r6, #0
mov r1, r8
mov r2, sb
@@ -1279,7 +1279,7 @@ sub_0801E1EC: @ 0x0801E1EC
adds r0, r0, r5
movs r1, #0xa0
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
adds r0, r4, #0
movs r1, #0
bl sub_0801E24C
@@ -1443,7 +1443,7 @@ sub_0801E31C: @ 0x0801E31C
adds r0, r0, r1
movs r1, #0xa0
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
cmp sl, sb
bge _0801E3DC
movs r6, #0
@@ -1628,7 +1628,7 @@ sub_0801E49C: @ 0x0801E49C
movs r2, #0xf0
lsls r2, r2, #3
ldr r1, _0801E5E8 @ =gUnk_02018EE0
bl _DmaFill16
bl MemFill16
adds r3, r5, #0
subs r3, #0x40
movs r2, #0xff
@@ -1738,7 +1738,7 @@ sub_0801E49C: @ 0x0801E49C
adds r0, r0, r6
movs r1, #0xa0
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
ldr r2, _0801E5E8 @ =gUnk_02018EE0
ldrb r1, [r5]
lsls r0, r1, #2
@@ -2142,11 +2142,11 @@ _0801E86C:
adds r0, r6, #0
adds r1, r7, #0
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
mov r0, r8
mov r1, sb
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
_0801E890:
movs r3, #1
add sb, r3
asm/code_08049D30.s
+3 -3
View File
@@ -1137,8 +1137,8 @@ _0804A570:
_0804A574: .4byte gUnk_080D2C58
_0804A578: .4byte 0x0000FFFF
thumb_func_start sub_0804A57C
sub_0804A57C: @ 0x0804A57C
thumb_func_start EnemyInit
EnemyInit: @ 0x0804A57C
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x10]
@@ -1524,7 +1524,7 @@ _0804A81C:
_0804A84A:
bl sub_0807CD9C
ldr r0, _0804A860 @ =0x80100000
bl PlaySFX
bl SoundReq
bl DeleteThisEntity
b _0804A982
.align 2, 0
asm/code_0804AA84.s
+2 -2
View File
@@ -45,7 +45,7 @@ _0804ABA4:
lsls r2, r2, #2
adds r1, r0, r2
movs r2, #0x20
bl _DmaCopy
bl MemCopy
ldr r2, _0804AC14 @ =gUsedPalettes
ldr r0, [r2]
movs r1, #0x80
@@ -197,7 +197,7 @@ sub_0804ACF8: @ 0x0804ACF8
bl sub_0804AD6C
bl sub_0805E5A8
movs r0, #0xf8
bl PlaySFX
bl SoundReq
_0804AD12:
pop {pc}
.align 2, 0
asm/code_0804AEB0.s
+1 -1
View File
@@ -50,7 +50,7 @@ _0804AEF6:
_0804AF00:
adds r0, r6, #0
movs r2, #0x10
bl _DmaCopy
bl MemCopy
pop {r4, r5, r6, pc}
.align 2, 0
asm/code_0804B058.s
+2 -2
View File
@@ -173,7 +173,7 @@ sub_0804B260: @ 0x0804B260
adds r0, r0, r1
ldr r1, _0804B278 @ =gUnk_02034398
movs r2, #0x20
bl _DmaCopy
bl MemCopy
pop {pc}
.align 2, 0
_0804B274: .4byte gUnk_080015BC
@@ -211,7 +211,7 @@ _0804B2A4:
adds r0, r2, #0
adds r1, r4, #0
movs r2, #8
bl _DmaCopy
bl MemCopy
ldrb r1, [r4, #6]
movs r0, #1
ands r0, r1
asm/code_0804B9F8.s
+4 -4
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_0804FF98
sub_0804FF98: @ 0x0804FF98
thumb_func_start FadeMain
FadeMain: @ 0x0804FF98
push {r4, r5, r6, r7, lr}
ldr r6, _0804FFD4 @ =gUnk_020354C0
ldr r1, _0804FFD8 @ =gUsedPalettes
@@ -50,10 +50,10 @@ sub_0804FFE4: @ 0x0804FFE4
ldr r4, _08050000 @ =gFadeControl
adds r0, r4, #0
movs r1, #0x1c
bl _DmaZero
bl MemClear32
ldr r0, _08050004 @ =gUnk_020354C0
movs r1, #0x80
bl _DmaZero
bl MemClear32
movs r0, #1
rsbs r0, r0, #0
str r0, [r4, #4]
asm/code_080526F8.s
+31 -31
View File
@@ -161,7 +161,7 @@ sub_080527FC: @ 0x080527FC
ldr r1, _08052834 @ =gPaletteBuffer
movs r2, #0x80
lsls r2, r2, #3
bl _DmaCopy
bl MemCopy
ldr r1, _08052838 @ =gUsedPalettes
movs r0, #1
rsbs r0, r0, #0
@@ -213,7 +213,7 @@ sub_08052878: @ 0x08052878
ldr r0, [r0]
str r0, [r1]
ldr r0, _08052898 @ =0x80010000
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_08052894: .4byte gArea
@@ -246,7 +246,7 @@ sub_080528B4: @ 0x080528B4
_080528C4: .4byte gScreenTransition
_080528C8:
bl sub_0804FFE4
ldr r1, _080528E8 @ =gUnk_03001000
ldr r1, _080528E8 @ =gMain
movs r2, #0
movs r0, #3
strb r0, [r1, #3]
@@ -255,12 +255,12 @@ _080528C8:
movs r1, #8
bl DoFade
ldr r0, _080528EC @ =0x80100000
bl PlaySFX
bl SoundReq
movs r0, #1
_080528E6:
pop {pc}
.align 2, 0
_080528E8: .4byte gUnk_03001000
_080528E8: .4byte gMain
_080528EC: .4byte 0x80100000
thumb_func_start sub_080528F0
@@ -377,7 +377,7 @@ _080529D4:
bl DoFade
_080529DC:
bl sub_080528F0
ldr r0, _080529F0 @ =gUnk_03001000
ldr r0, _080529F0 @ =gMain
movs r1, #3
strb r1, [r0, #4]
movs r1, #1
@@ -385,7 +385,7 @@ _080529DC:
movs r0, #1
b _080529F6
.align 2, 0
_080529F0: .4byte gUnk_03001000
_080529F0: .4byte gMain
_080529F4:
movs r0, #0
_080529F6:
@@ -791,7 +791,7 @@ sub_08052CFC: @ 0x08052CFC
ldr r4, _08052D44 @ =gArea
ldr r1, _08052D48 @ =0x00000894
adds r0, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _08052D4C @ =gRoomControls
ldrb r1, [r0, #4]
lsls r1, r1, #2
@@ -846,7 +846,7 @@ sub_08052D74: @ 0x08052D74
push {r4, r5, lr}
adds r3, r0, #0
adds r4, r1, #0
ldr r0, _08052D98 @ =gUnk_03001000
ldr r0, _08052D98 @ =gMain
ldrb r0, [r0, #4]
cmp r0, #7
beq _08052D96
@@ -863,7 +863,7 @@ sub_08052D74: @ 0x08052D74
_08052D96:
pop {r4, r5, pc}
.align 2, 0
_08052D98: .4byte gUnk_03001000
_08052D98: .4byte gMain
_08052D9C: .4byte gArea
_08052DA0: .4byte 0x00000888
_08052DA4: .4byte 0x0000088C
@@ -996,7 +996,7 @@ sub_08052EA0: @ 0x08052EA0
ldr r4, _08052EE4 @ =gRoomVars
adds r0, r4, #0
movs r1, #0xcc
bl _DmaZero
bl MemClear32
movs r0, #0xff
strb r0, [r4, #0x10]
strb r0, [r4, #0x11]
@@ -1178,7 +1178,7 @@ sub_08052FF4: @ 0x08052FF4
ldr r5, _08053074 @ =gUnk_020342CC
adds r0, r5, #0
movs r1, #0x20
bl _DmaZero
bl MemClear32
str r5, [r5, #0x20]
ldr r0, _08053078 @ =gAreaRoomHeaders
lsls r6, r6, #2
@@ -1258,7 +1258,7 @@ sub_080530B0: @ 0x080530B0
ldr r0, _080530C0 @ =gUnk_080FCAF8
ldr r1, _080530C4 @ =gUnk_030010EC
movs r2, #0x20
bl _DmaCopy
bl MemCopy
pop {pc}
.align 2, 0
_080530C0: .4byte gUnk_080FCAF8
@@ -1431,7 +1431,7 @@ sub_080531F8: @ 0x080531F8
ldr r1, _08053248 @ =gUnk_02002AC8
adds r0, r5, #0
movs r2, #0x20
bl _DmaCopy
bl MemCopy
bl CheckIsDungeon
cmp r0, #0
beq _08053238
@@ -1483,7 +1483,7 @@ sub_08053250: @ 0x08053250
adds r0, #0xc
ldr r1, _08053298 @ =gUnk_02002AC8
movs r2, #0x20
bl _DmaCopy
bl MemCopy
pop {r4, pc}
.align 2, 0
_0805328C: .4byte gScreenTransition
@@ -1570,17 +1570,17 @@ sub_08053320: @ 0x08053320
movs r4, #0x80
lsls r4, r4, #4
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _08053380 @ =gBG1Buffer
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _08053384 @ =gBG2Buffer
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _08053388 @ =gBG3Buffer
movs r1, #0x80
lsls r1, r1, #5
bl _DmaZero
bl MemClear32
movs r0, #0x10
bl LoadGfxGroup
movs r0, #0x17
@@ -1775,7 +1775,7 @@ sub_080534AC: @ 0x080534AC
movs r1, #0
str r1, [r0]
ldr r0, _080534E0 @ =0x80100000
bl PlaySFX
bl SoundReq
_080534D6:
pop {r4, pc}
.align 2, 0
@@ -1964,7 +1964,7 @@ sub_08053634: @ 0x08053634
ldr r1, _08053644 @ =gUnk_02032EC0
movs r0, #3
strb r0, [r1]
bl sub_08056418
bl MessageInitialize
pop {pc}
.align 2, 0
_08053644: .4byte gUnk_02032EC0
@@ -2018,7 +2018,7 @@ sub_0805368C: @ 0x0805368C
beq _080536A6
bl DeleteEntity
movs r0, #0xf0
bl PlaySFX
bl SoundReq
_080536A6:
pop {pc}
@@ -2169,7 +2169,7 @@ sub_08053758: @ 0x08053758
ldr r0, _080537FC @ =0x00001DC1
strh r0, [r2, #0x20]
movs r0, #0xf
bl PlaySFX
bl SoundReq
bl sub_0805E5B4
movs r1, #0x80
lsls r1, r1, #1
@@ -2222,7 +2222,7 @@ sub_08053800: @ 0x08053800
ldr r0, _08053888 @ =gBG1Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
ldr r0, _0805388C @ =0x00000F01
adds r5, r5, r0
ldr r1, [r4]
@@ -2732,7 +2732,7 @@ sub_08053C20: @ 0x08053C20
movs r1, #0x10
bl DoFade
movs r0, #0x33
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_08053C50: .4byte gMenu
@@ -2751,9 +2751,9 @@ sub_08053C60: @ 0x08053C60
movs r1, #2
bl DoFade
movs r0, #0xf4
bl PlaySFX
bl SoundReq
ldr r0, _08053C80 @ =0x80100000
bl PlaySFX
bl SoundReq
movs r0, #3
bl InitScreen
pop {pc}
@@ -3268,7 +3268,7 @@ _08054098:
ldrb r0, [r4, #2]
bl ModHealth
movs r0, #0x71
bl PlaySFX
bl SoundReq
b _0805427C
_080540A6:
ldr r0, _080540BC @ =gUnk_080FD5A8
@@ -3278,7 +3278,7 @@ _080540A6:
ldrh r0, [r1]
bl ModRupees
movs r0, #0x6f
bl PlaySFX
bl SoundReq
b _0805427C
.align 2, 0
_080540BC: .4byte gUnk_080FD5A8
@@ -3350,7 +3350,7 @@ _0805412C:
movs r1, #1
bl sub_0807CAA0
ldr r0, _08054148 @ =0x00000109
bl PlaySFX
bl SoundReq
b _0805427C
.align 2, 0
_08054144: .4byte gSave
@@ -3482,7 +3482,7 @@ _08054240:
bl sub_080542C0
_0805424E:
ldr r0, _08054258 @ =0x00000103
bl PlaySFX
bl SoundReq
b _0805427C
.align 2, 0
_08054258: .4byte 0x00000103
asm/code_0805436C.s
+13 -13
View File
@@ -61,8 +61,8 @@ sub_080548E8: @ 0x080548E8
bl sub_0805E5C0
bl sub_080AD9B0
bl sub_080AD918
bl sub_0807FC40
bl sub_0801B060
bl UpdateScroll
bl UpdateBgAnim
bl sub_08000108
pop {pc}
.align 2, 0
@@ -72,7 +72,7 @@ _0805491C: .4byte gMenu
thumb_func_start sub_08054920
sub_08054920: @ 0x08054920
push {lr}
bl sub_08056418
bl MessageInitialize
bl sub_0806F38C
ldr r1, _08054948 @ =gUnk_080C9CBC
ldr r0, _0805494C @ =gUnk_02022740
@@ -258,7 +258,7 @@ sub_08054A60: @ 0x08054A60
ands r0, r1
strb r0, [r4, #0x14]
adds r0, r4, #0
bl sub_0806FBD8
bl AllocMutableHitbox
cmp r0, #0
bne _08054AAC
bl DeleteThisEntity
@@ -514,7 +514,7 @@ sub_08054C88: @ 0x08054C88
movs r1, #0x10
bl DoFade
movs r0, #0x73
bl PlaySFX
bl SoundReq
ldrb r0, [r4, #6]
adds r0, #1
strb r0, [r4, #6]
@@ -865,7 +865,7 @@ sub_08054EFC: @ 0x08054EFC
bl sub_0806FAD8
_08054F54:
movs r0, #0xfd
bl PlaySFX
bl SoundReq
pop {r4, r5, pc}
.align 2, 0
_08054F5C: .4byte gRoomControls
@@ -1264,7 +1264,7 @@ sub_0805524C: @ 0x0805524C
adds r0, #1
strb r0, [r3, #7]
movs r0, #0xf6
bl PlaySFX
bl SoundReq
b _080552D6
.align 2, 0
_08055270: .4byte gMenu
@@ -1313,7 +1313,7 @@ _080552B4:
adds r0, #1
strb r0, [r3, #6]
movs r0, #0x73
bl PlaySFX
bl SoundReq
_080552D6:
pop {r4, pc}
.align 2, 0
@@ -1418,7 +1418,7 @@ sub_08055380: @ 0x08055380
movs r1, #0x10
bl DoFade
movs r0, #0x73
bl PlaySFX
bl SoundReq
ldrb r0, [r4, #6]
adds r0, #1
strb r0, [r4, #6]
@@ -1563,7 +1563,7 @@ sub_08055498: @ 0x08055498
movs r1, #0x10
bl DoFade
movs r0, #0x73
bl PlaySFX
bl SoundReq
ldrb r0, [r4, #6]
adds r0, #1
strb r0, [r4, #6]
@@ -2228,7 +2228,7 @@ _080559AE:
ldrb r0, [r4, #4]
bl sub_080553E0
movs r0, #0x73
bl PlaySFX
bl SoundReq
pop {r4, pc}
.align 2, 0
_080559D8: .4byte gMenu
@@ -2321,7 +2321,7 @@ sub_08055A6C: @ 0x08055A6C
movs r1, #0x10
bl DoFade
movs r0, #0x73
bl PlaySFX
bl SoundReq
ldrb r0, [r4, #6]
adds r0, #1
strb r0, [r4, #6]
@@ -2584,7 +2584,7 @@ _08055C8C:
movs r1, #0x10
bl DoFade
movs r0, #0x73
bl PlaySFX
bl SoundReq
ldr r0, _08055CAC @ =gMenu
ldrb r1, [r0, #6]
adds r1, #1
asm/code_08056418.s
+23 -23
View File
@@ -179,7 +179,7 @@ _0805680A:
_08056812:
adds r0, r4, #0
movs r1, #0
bl sub_0805F324
bl sub_GetFontStrWidth
adds r3, r0, #0
adds r4, r5, #0
adds r4, #0x56
@@ -242,7 +242,7 @@ _0805687A:
b _08056942
_0805688C:
ldrh r0, [r5, #0x22]
bl PlaySFX
bl SoundReq
b _08056942
_08056894:
ldr r1, _080568A8 @ =gUnk_02022780
@@ -267,11 +267,11 @@ _080568B2:
beq _080568D2
adds r0, r6, #0
movs r1, #4
bl _DmaZero
bl MemClear32
ldr r4, _08056910 @ =gUnk_02024030
adds r0, r4, #0
movs r1, #0x18
bl _DmaZero
bl MemClear32
movs r0, #1
strb r0, [r4]
strb r0, [r6]
@@ -472,9 +472,9 @@ _08056A30:
movs r1, #3
strb r1, [r2]
movs r1, #0x18
bl _DmaZero
bl MemClear32
movs r0, #0x6a
bl PlaySFX
bl SoundReq
adds r1, r6, #0
adds r1, #0x89
movs r0, #1
@@ -502,7 +502,7 @@ _08056A6A:
beq _08056A90
strb r5, [r4, #3]
movs r0, #0x69
bl PlaySFX
bl SoundReq
movs r1, #1
b _08056A92
.align 2, 0
@@ -610,7 +610,7 @@ _08056B48:
cmp r0, #0
beq _08056B70
movs r0, #0x68
bl PlaySFX
bl SoundReq
adds r0, r4, #0
adds r0, #0x9a
strb r5, [r0]
@@ -696,7 +696,7 @@ sub_08056BDC: @ 0x08056BDC
ldr r1, _08056C28 @ =gUnk_02000D00
movs r2, #0xd0
lsls r2, r2, #4
bl _DmaFill32
bl MemFill32
bl sub_08056F70
adds r1, r4, #0
adds r1, #0x9e
@@ -752,8 +752,8 @@ sub_08056C54: @ 0x08056C54
_08056C60: .4byte gTextBox
_08056C64: .4byte gUnk_02022780
thumb_func_start sub_08056C68
sub_08056C68: @ 0x08056C68
thumb_func_start DeleteWindow
DeleteWindow: @ 0x08056C68
push {r4, r5, r6, lr}
ldr r5, _08056CB8 @ =gUnk_02036A38
ldrb r0, [r5, #1]
@@ -894,8 +894,8 @@ _08056D66:
pop {r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_start sub_08056D70
sub_08056D70: @ 0x08056D70
thumb_func_start CreateWindow
CreateWindow: @ 0x08056D70
push {r4, lr}
ldr r0, _08056DB4 @ =gUnk_02022780
adds r0, #0x9b
@@ -915,9 +915,9 @@ sub_08056D70: @ 0x08056D70
ldr r3, _08056DC0 @ =0x0000F07B
ldrb r1, [r4, #6]
ldrb r2, [r4, #7]
bl sub_08056DC8
bl sub_08056EC0
bl sub_08056F1C
bl DispMessageFrame
bl DispString
bl DispCursor
ldr r2, _08056DC4 @ =gUnk_02036A38
ldr r0, [r4]
ldr r1, [r4, #4]
@@ -933,8 +933,8 @@ _08056DBC: .4byte gBG0Buffer
_08056DC0: .4byte 0x0000F07B
_08056DC4: .4byte gUnk_02036A38
thumb_func_start sub_08056DC8
sub_08056DC8: @ 0x08056DC8
thumb_func_start DispMessageFrame
DispMessageFrame: @ 0x08056DC8
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8
@@ -1066,8 +1066,8 @@ _08056EB6:
pop {r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_start sub_08056EC0
sub_08056EC0: @ 0x08056EC0
thumb_func_start DispString
DispString: @ 0x08056EC0
push {r4, r5, r6, r7, lr}
ldr r6, _08056F10 @ =gUnk_02036A40
ldrb r0, [r6, #6]
@@ -1116,8 +1116,8 @@ _08056F10: .4byte gUnk_02036A40
_08056F14: .4byte gUnk_02034CB2
_08056F18: .4byte gUnk_0202281E
thumb_func_start sub_08056F1C
sub_08056F1C: @ 0x08056F1C
thumb_func_start DispCursor
DispCursor: @ 0x08056F1C
push {lr}
ldr r0, _08056F58 @ =gUnk_02022780
adds r0, #0x98
@@ -1163,7 +1163,7 @@ sub_08056F70: @ 0x08056F70
ldr r1, _08056F84 @ =0x0600D040
movs r2, #0xd0
lsls r2, r2, #4
bl LoadAssetAsync
bl LoadResourceAsync
pop {pc}
.align 2, 0
_08056F80: .4byte gUnk_02000D00
asm/code_0805E3B0.s
+4 -4
View File
@@ -331,7 +331,7 @@ sub_0805E5C0: @ 0x0805E5C0
strb r2, [r0, #4]
bl sub_0805ED30
bl sub_0805E428
bl sub_080175E8
bl ClearHitboxList
bl sub_0806F0A4
ldr r1, _0805E5F4 @ =gUnk_03005F40
movs r0, #0
@@ -360,15 +360,15 @@ EraseAllEntities: @ 0x0805E60C
bl DeleteAllEntities
ldr r0, _0805E654 @ =gUnk_03003DC0
movs r1, #0xc
bl _DmaZero
bl MemClear32
ldr r0, _0805E658 @ =gPlayerEntity
movs r1, #0xaa
lsls r1, r1, #6
bl _DmaZero
bl MemClear32
ldr r0, _0805E65C @ =gUnk_02033290
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
bl sub_0805E98C
ldr r0, _0805E660 @ =gEntCount
movs r1, #0
asm/code_0805EC04.s
+13 -13
View File
@@ -751,7 +751,7 @@ _0805F2D0:
bne _0805F2F0
adds r0, r5, #0
movs r1, #0xc
bl _DmaZero
bl MemClear32
ldrb r0, [r4]
movs r1, #1
orrs r0, r1
@@ -781,7 +781,7 @@ _0805F308:
cmp r0, r2
bne _0805F318
movs r1, #0xc
bl _DmaZero
bl MemClear32
b _0805F320
.align 2, 0
_0805F314: .4byte gUnk_02036540
@@ -794,8 +794,8 @@ _0805F320:
pop {pc}
.align 2, 0
thumb_func_start sub_0805F324
sub_0805F324: @ 0x0805F324
thumb_func_start sub_GetFontStrWidth
sub_GetFontStrWidth: @ 0xGetFontStrWidth
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
@@ -805,7 +805,7 @@ sub_0805F324: @ 0x0805F324
adds r7, r1, #0
mov r1, sp
movs r2, #0x30
bl _DmaCopy
bl MemCopy
movs r0, #0
str r0, [sp, #0x34]
movs r1, #0
@@ -944,7 +944,7 @@ sub_0805F440: @ 0x0805F440
adds r4, r0, #0
adds r5, r1, #0
movs r1, #0x30
bl _DmaZero
bl MemClear32
ldr r0, _0805F45C @ =0x0000FFFF
cmp r5, r0
bls _0805F460
@@ -981,7 +981,7 @@ _0805F486:
adds r0, r5, #0
adds r1, r4, #0
movs r2, #0x18
bl _DmaCopy
bl MemCopy
mov r0, sp
adds r1, r6, #0
bl sub_0805F440
@@ -1028,7 +1028,7 @@ _0805F486:
str r0, [r4, #4]
mov r0, sp
movs r1, #1
bl sub_0805F324
bl sub_GetFontStrWidth
lsrs r2, r0, #0x18
ldrb r1, [r4, #0x16]
muls r2, r1, r2
@@ -1087,7 +1087,7 @@ _0805F554:
adds r1, r4, #0
adds r2, r7, #0
adds r3, r6, #0
bl sub_08056DC8
bl DispMessageFrame
adds r5, #2
mov r1, sb
ldrh r0, [r1, #0x10]
@@ -1122,7 +1122,7 @@ _0805F596:
_0805F59E:
ldr r0, _0805F5C8 @ =gUnk_02034330
movs r1, #0x18
bl _DmaZero
bl MemClear32
_0805F5A6:
mov r0, sb
mov r1, sp
@@ -1158,10 +1158,10 @@ sub_0805F5CC: @ 0x0805F5CC
lsls r3, r3, #1
ands r2, r3
lsls r2, r2, #3
bl _DmaFill32
bl MemFill32
adds r0, r6, #0
movs r1, #0
bl sub_0805F324
bl sub_GetFontStrWidth
adds r2, r0, #0
ldrb r1, [r4, #0x13]
movs r0, #1
@@ -1211,7 +1211,7 @@ _0805F63A:
ldr r0, [r4, #8]
ldr r1, [r4, #4]
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
ldr r0, [r4, #4]
adds r0, r0, r5
str r0, [r4, #4]
asm/code_0806ED78.s
+3 -3
View File
@@ -842,7 +842,7 @@ sub_0806F364: @ 0x0806F364
adds r1, r2, r3
adds r0, r0, r1
movs r1, #0x10
bl _DmaZero
bl MemClear32
pop {pc}
.align 2, 0
_0806F384: .4byte gArea
@@ -1013,7 +1013,7 @@ _0806F444:
str r0, [r5, #0x50]
_0806F4B4:
movs r0, #0xed
bl PlaySFX
bl SoundReq
b _0806F4D8
.align 2, 0
_0806F4BC: .4byte gPlayerEntity
@@ -1026,7 +1026,7 @@ _0806F4C8:
ldr r0, [r0, #0x2c]
strb r1, [r0, #0xa]
movs r0, #0xef
bl PlaySFX
bl SoundReq
_0806F4D8:
movs r0, #1
b _0806F4E2
asm/code_0806FA6C.s
+12 -12
View File
@@ -123,19 +123,19 @@ _0806FBCC:
_0806FBD0: .4byte gScreenTransition
_0806FBD4: .4byte gPlayerState
thumb_func_start sub_0806FBD8
sub_0806FBD8: @ 0x0806FBD8
thumb_func_start AllocMutableHitbox
AllocMutableHitbox: @ 0x0806FBD8
push {r4, lr}
adds r4, r0, #0
bl UnloadBoundingBox
bl UnloadHitbox
movs r0, #0xc
bl sub_0801D8E0
bl zMalloc
str r0, [r4, #0x48]
pop {r4, pc}
.align 2, 0
thumb_func_start UnloadBoundingBox
UnloadBoundingBox: @ 0x0806FBEC
thumb_func_start UnloadHitbox
UnloadHitbox: @ 0x0806FBEC
push {r4, lr}
adds r4, r0, #0
ldr r0, [r4, #0x48]
@@ -385,7 +385,7 @@ sub_0806FD8C: @ 0x0806FD8C
ldr r0, _0806FD9C @ =gUnk_020000C0
movs r1, #0xc0
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
pop {pc}
.align 2, 0
_0806FD9C: .4byte gUnk_020000C0
@@ -534,7 +534,7 @@ _0806FE9E:
bls _0806FE9E
adds r0, r6, #0
movs r1, #0x40
bl _DmaZero
bl MemClear32
_0806FEB4:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -973,7 +973,7 @@ _0807018C:
adds r0, r5, #0
bl InitializeAnimation
ldr r0, _080701F4 @ =0x000001DD
bl PlaySFX
bl SoundReq
pop {r4, r5, pc}
.align 2, 0
_080701F0: .4byte gUnk_0811B9A8
@@ -1325,7 +1325,7 @@ _0807049E:
adds r0, r4, #0
bl sub_08017744
ldr r0, _080704B8 @ =0x00000199
bl PlaySFX
bl SoundReq
pop {r4, r5, r6, pc}
.align 2, 0
_080704B4: .4byte gRoomControls
@@ -1358,7 +1358,7 @@ sub_080704D4: @ 0x080704D4
bl sub_080AE008
movs r0, #0x87
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
adds r0, r4, #0
bl sub_080704FC
pop {r4, pc}
@@ -1454,7 +1454,7 @@ sub_0807059C: @ 0x0807059C
push {lr}
ldr r0, _080705A8 @ =gUnk_02034490
movs r1, #0x18
bl _DmaZero
bl MemClear32
pop {pc}
.align 2, 0
_080705A8: .4byte gUnk_02034490
asm/code_08070698.s
+14 -14
View File
@@ -198,7 +198,7 @@ sub_080715D4: @ 0x080715D4
orrs r0, r1
str r0, [r2, #0x30]
ldr r0, _08071630 @ =0x0000016F
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_08071628: .4byte gPlayerState
@@ -1058,7 +1058,7 @@ _08071C5A:
bl sub_0800451C
bl ResetPlayer
movs r0, #0x87
bl PlaySFX
bl SoundReq
_08071C9C:
pop {r4, r5, pc}
.align 2, 0
@@ -1105,7 +1105,7 @@ _08071CEE:
movs r0, #0xf0
strb r0, [r4, #0xe]
movs r0, #0x7b
bl PlaySFX
bl SoundReq
_08071CFE:
pop {r4, pc}
.align 2, 0
@@ -1434,7 +1434,7 @@ sub_08071F50: @ 0x08071F50
strh r0, [r1, #8]
bl sub_08077B20
ldr r0, _08071F7C @ =0x00000195
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_08071F78: .4byte gPlayerState
@@ -1936,9 +1936,9 @@ _08072332:
bl ResetPlayer
movs r0, #0x92
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
movs r0, #0x7a
bl PlaySFX
bl SoundReq
pop {r4, r5, pc}
.align 2, 0
_08072350: .4byte 0x00000401
@@ -1991,7 +1991,7 @@ sub_08072354: @ 0x08072354
bl CreateFx
movs r0, #0xd3
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_080723C0:
pop {r4, pc}
.align 2, 0
@@ -2093,7 +2093,7 @@ sub_0807246C: @ 0x0807246C
lsls r0, r0, #2
strh r0, [r2, #8]
movs r0, #0x7b
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_0807248C: .4byte gPlayerState
@@ -2390,16 +2390,16 @@ _080726BE:
cmp r1, #0
beq _080726E4
movs r0, #0x79
bl PlaySFX
bl SoundReq
b _080726EA
.align 2, 0
_080726E0: .4byte gPlayerState
_080726E4:
movs r0, #0x78
bl PlaySFX
bl SoundReq
_080726EA:
movs r0, #0x7e
bl PlaySFX
bl SoundReq
pop {r4, r5, pc}
.align 2, 0
@@ -2840,7 +2840,7 @@ _08072A14:
adds r0, r5, #0
bl sub_08072A60
movs r0, #0x81
bl PlaySFX
bl SoundReq
_08072A4C:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -3089,7 +3089,7 @@ _08072C1E:
lsls r0, r0, #4
strh r0, [r1, #8]
movs r0, #0x7c
bl PlaySFX
bl SoundReq
_08072C40:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -3449,7 +3449,7 @@ _08072EF8:
adds r0, #0x42
strb r1, [r0]
movs r0, #0x7d
bl PlaySFX
bl SoundReq
_08072F10:
pop {r4, r5, pc}
.align 2, 0
asm/code_080732D0.s
+34 -34
View File
@@ -37,7 +37,7 @@ _080732EE:
cmp r0, #7
bne _08073320
ldr r0, _0807331C @ =0x00000187
bl PlaySFX
bl SoundReq
b _08073328
.align 2, 0
_08073318: .4byte gPlayerState
@@ -45,7 +45,7 @@ _0807331C: .4byte 0x00000187
_08073320:
movs r0, #0xc4
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08073328:
pop {r4, pc}
.align 2, 0
@@ -113,7 +113,7 @@ _08073386:
_0807339C: .4byte gPlayerState
_080733A0: .4byte gRoomControls
_080733A4:
ldr r0, _080733B8 @ =gUnk_03001000
ldr r0, _080733B8 @ =gMain
movs r1, #3
strb r1, [r0, #4]
movs r1, #1
@@ -124,7 +124,7 @@ _080733A4:
_080733B6:
pop {r4, pc}
.align 2, 0
_080733B8: .4byte gUnk_03001000
_080733B8: .4byte gMain
thumb_func_start sub_080733BC
sub_080733BC: @ 0x080733BC
@@ -351,7 +351,7 @@ _08073516:
strb r0, [r4, #0xe]
movs r0, #0xa9
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08073576:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
@@ -935,7 +935,7 @@ _080739BC:
bl sub_0806F948
_080739CE:
movs r0, #0x7c
bl PlaySFX
bl SoundReq
_080739D4:
ldr r2, _080739E8 @ =gPlayerState
ldrb r1, [r2, #2]
@@ -1139,7 +1139,7 @@ _08073B50:
_08073B54:
strh r0, [r2, #8]
movs r0, #0x7d
bl PlaySFX
bl SoundReq
_08073B5C:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -1243,7 +1243,7 @@ _08073C0C:
bl sub_08080964
movs r0, #0xa6
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08073C28:
pop {r4, r5, pc}
.align 2, 0
@@ -1584,7 +1584,7 @@ _08073E9E:
rsbs r0, r0, #0
bl ModHealth
movs r0, #0x7a
bl PlaySFX
bl SoundReq
_08073EDC:
ldr r0, [r5, #0x30]
movs r1, #0x40
@@ -1732,7 +1732,7 @@ sub_08073FD0: @ 0x08073FD0
orrs r0, r1
strb r0, [r4, #0x18]
movs r0, #0x7c
bl PlaySFX
bl SoundReq
_08073FF8:
movs r1, #0x80
lsls r1, r1, #6
@@ -1746,7 +1746,7 @@ _08073FF8:
strb r0, [r4, #0xd]
movs r0, #0xb8
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08074016:
pop {r4, pc}
@@ -2452,7 +2452,7 @@ sub_0807450C: @ 0x0807450C
rsbs r0, r0, #0
bl ModHealth
movs r0, #0x7a
bl PlaySFX
bl SoundReq
movs r0, #0x18
strb r0, [r4]
adds r1, r6, #0
@@ -2581,7 +2581,7 @@ _08074618:
bne _08074636
_08074630:
movs r0, #0x83
bl PlaySFX
bl SoundReq
_08074636:
pop {r4, r5, pc}
@@ -2703,7 +2703,7 @@ _08074704:
beq _08074720
_08074714:
ldr r0, _0807471C @ =0x00000161
bl PlaySFX
bl SoundReq
b _08074732
.align 2, 0
_0807471C: .4byte 0x00000161
@@ -2715,7 +2715,7 @@ _08074720:
cmp r0, #0
bne _08074732
ldr r0, _08074764 @ =0x00000161
bl PlaySFX
bl SoundReq
_08074732:
ldr r2, _08074768 @ =gPlayerState
adds r1, r2, #0
@@ -2872,7 +2872,7 @@ _08074840:
bl CreateFx
_08074862:
ldr r0, _080748B0 @ =0x000001A5
bl PlaySFX
bl SoundReq
bl ResetPlayer
_0807486C:
ldr r5, _080748AC @ =gPlayerState
@@ -3995,7 +3995,7 @@ _0807504E:
adds r0, #1
strb r0, [r1]
movs r0, #0x7c
bl PlaySFX
bl SoundReq
_08075086:
pop {pc}
.align 2, 0
@@ -4052,7 +4052,7 @@ _080750CE:
adds r0, #0x68
strb r1, [r0]
movs r0, #0x7d
bl PlaySFX
bl SoundReq
_080750F2:
pop {r4, pc}
@@ -4108,7 +4108,7 @@ sub_0807513C: @ 0x0807513C
movs r0, #0
strb r0, [r4]
movs r0, #0x7c
bl PlaySFX
bl SoundReq
_08075158:
ldrb r0, [r4]
cmp r0, #2
@@ -4116,9 +4116,9 @@ _08075158:
movs r0, #0
strb r0, [r4]
ldr r0, _08075188 @ =0x0000014B
bl PlaySFX
bl SoundReq
movs r0, #0x7a
bl PlaySFX
bl SoundReq
_0807516E:
ldrb r1, [r4]
movs r0, #0x80
@@ -4198,7 +4198,7 @@ sub_080751E8: @ 0x080751E8
ldr r4, _08075230 @ =gPlayerScriptExecutionContext
adds r0, r4, #0
movs r1, #0x24
bl _DmaZero
bl MemClear32
str r6, [r4]
ldr r0, _08075234 @ =gPlayerEntity
adds r0, #0x84
@@ -4383,7 +4383,7 @@ sub_08075338: @ 0x08075338
lsls r0, r0, #4
strh r0, [r4, #8]
movs r0, #0x75
bl PlaySFX
bl SoundReq
b _080754B4
.align 2, 0
_0807536C: .4byte gPlayerState
@@ -4516,7 +4516,7 @@ _0807541E:
adds r0, r5, #0
bl sub_08077DF4
movs r0, #0x77
bl PlaySFX
bl SoundReq
b _080754B4
_08075480:
ldrb r1, [r4, #0x1b]
@@ -4867,7 +4867,7 @@ _080756E0:
bl sub_0807A108
_08075726:
movs r0, #0x76
bl PlaySFX
bl SoundReq
pop {r4, r5, pc}
.align 2, 0
_08075730: .4byte gPlayerState
@@ -5392,7 +5392,7 @@ _08075B08:
ands r2, r0
strb r2, [r3, #0xb]
ldr r0, _08075B48 @ =0x0000013D
bl PlaySFX
bl SoundReq
b _08075B52
.align 2, 0
_08075B44: .4byte gPlayerState
@@ -5445,7 +5445,7 @@ _08075B86:
bl sub_08077E78
movs r0, #0x9f
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _08075C80
.align 2, 0
_08075BB0: .4byte gPlayerState
@@ -6063,7 +6063,7 @@ _08076036:
bl ModBombs
movs r0, #0x82
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08076076:
adds r0, r6, #0
adds r1, r7, #0
@@ -6214,7 +6214,7 @@ _08076198:
strb r2, [r4, #7]
_0807619A:
movs r0, #0x7f
bl PlaySFX
bl SoundReq
_080761A0:
pop {r3}
mov r8, r3
@@ -6316,7 +6316,7 @@ _08076258:
_08076264:
movs r0, #0x81
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _080762C0
_0807626E:
movs r0, #5
@@ -6350,7 +6350,7 @@ _080762A2:
bl sub_08077DF4
_080762AA:
movs r0, #0x88
bl PlaySFX
bl SoundReq
b _080762C0
.align 2, 0
_080762B4: .4byte 0x00000948
@@ -6954,7 +6954,7 @@ _08076720:
_0807673C:
bl sub_08077F84
movs r0, #0x78
bl PlaySFX
bl SoundReq
b _08076754
.align 2, 0
_08076748: .4byte gPlayerEntity
@@ -7016,7 +7016,7 @@ sub_08076758: @ 0x08076758
strh r0, [r5, #8]
movs r0, #0xb9
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _080767FE
.align 2, 0
_080767C0: .4byte gPlayerState
@@ -7087,7 +7087,7 @@ _08076834:
cmp r0, #0
bne _0807684A
movs r0, #0x7d
bl PlaySFX
bl SoundReq
_0807684A:
ldr r2, _08076880 @ =gPlayerState
ldr r0, [r2, #0x30]
asm/code_08076C80.s
+4 -4
View File
@@ -546,7 +546,7 @@ _0807720E:
movs r0, #3
strb r0, [r4, #4]
ldr r0, _08077244 @ =0x00000107
bl PlaySFX
bl SoundReq
b _080772A4
.align 2, 0
_08077240: .4byte gPlayerEntity
@@ -597,7 +597,7 @@ _0807728C:
_0807729C:
movs r0, #0x84
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_080772A4:
pop {r4, r5, pc}
.align 2, 0
@@ -727,7 +727,7 @@ _0807738C:
beq _080773BC
movs r0, #0x84
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
ldrb r2, [r4, #0xe]
adds r0, r5, #0
movs r1, #0x1e
@@ -797,7 +797,7 @@ _08077432:
strb r0, [r4, #4]
strb r6, [r4, #5]
ldr r0, _08077444 @ =0x00000119
bl PlaySFX
bl SoundReq
_0807743E:
pop {r4, r5, r6, pc}
.align 2, 0
asm/code_08077B98.s
+3 -3
View File
@@ -116,7 +116,7 @@ _080780A0:
movs r0, #4
strb r0, [r2]
movs r0, #0xd8
bl PlaySFX
bl SoundReq
b _080780DA
.align 2, 0
_080780BC: .4byte 0x0000031F
@@ -128,7 +128,7 @@ _080780C0:
cmp r0, #0
bne _080780DA
movs r0, #0xd7
bl PlaySFX
bl SoundReq
b _080780DA
_080780D6:
movs r0, #1
@@ -642,7 +642,7 @@ sub_080784C8: @ 0x080784C8
movs r1, #0xc4
lsls r1, r1, #1
adds r0, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _080784E0 @ =gUnk_0811C000
str r0, [r4, #4]
pop {r4, pc}
asm/code_08078778.s
+11 -11
View File
@@ -70,7 +70,7 @@ sub_080788E0: @ 0x080788E0
ldr r1, _08078900 @ =gUnk_03003DF8
adds r0, r0, r1
movs r1, #0xc
bl _DmaZero
bl MemClear32
_080788FC:
pop {pc}
.align 2, 0
@@ -538,11 +538,11 @@ sub_08078C24: @ 0x08078C24
rsbs r0, r0, #0
adds r1, #4
movs r2, #0x40
bl _DmaFill32
bl MemFill32
ldr r0, _08078CB0 @ =gUnk_03003DF0
movs r1, #0xc4
lsls r1, r1, #1
bl _DmaZero
bl MemClear32
pop {pc}
.align 2, 0
_08078CAC: .4byte gPlayerState
@@ -1156,7 +1156,7 @@ sub_080790E4: @ 0x080790E4
rsbs r0, r0, #0
bl ModHealth
movs r0, #0x7a
bl PlaySFX
bl SoundReq
b _08079182
.align 2, 0
_08079128: .4byte gPlayerState
@@ -2819,7 +2819,7 @@ _08079D92:
strb r0, [r1]
bl sub_08077B20
ldr r0, _08079DC8 @ =0x00000193
bl PlaySFX
bl SoundReq
_08079DBE:
pop {pc}
.align 2, 0
@@ -2849,7 +2849,7 @@ sub_08079DCC: @ 0x08079DCC
movs r0, #0xe
strb r0, [r3, #0xc]
ldr r0, _08079E04 @ =0x00000193
bl PlaySFX
bl SoundReq
_08079DF8:
pop {pc}
.align 2, 0
@@ -4929,7 +4929,7 @@ _0807AD52:
orrs r0, r1
strb r0, [r2]
ldr r0, _0807ADA0 @ =0x00000163
bl PlaySFX
bl SoundReq
_0807AD74:
ldr r0, _0807ADA4 @ =gPlayerState
adds r0, #0x26
@@ -5014,7 +5014,7 @@ _0807ADF8:
strb r4, [r0]
_0807AE0E:
ldr r0, _0807AE18 @ =0x00000163
bl PlaySFX
bl SoundReq
movs r0, #1
b _0807AE1E
.align 2, 0
@@ -5066,7 +5066,7 @@ _0807AE64:
bl sub_08079520
movs r0, #0xb1
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0807AE74:
movs r0, #0x10
bl sub_080793E4
@@ -5090,7 +5090,7 @@ _0807AE74:
rsbs r0, r0, #0
bl ModHealth
movs r0, #0x7a
bl PlaySFX
bl SoundReq
_0807AEA8:
ldrb r1, [r4, #0x15]
movs r0, #0x80
@@ -5638,7 +5638,7 @@ sub_0807B264: @ 0x0807B264
strb r0, [r1]
movs r0, #0xa9
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0807B2B0:
pop {r4, pc}
.align 2, 0
asm/code_0807B9B8.s
+38 -38
View File
@@ -822,14 +822,14 @@ sub_0807BFD0: @ 0x0807BFD0
adds r0, r7, #0
adds r1, r6, #0
mov r2, r8
bl _DmaFill16
bl MemFill16
movs r5, #0
strh r5, [r6]
ldr r4, _0807C0C0 @ =gMetatileTypesTop
adds r0, r7, #0
adds r1, r4, #0
mov r2, r8
bl _DmaFill16
bl MemFill16
strh r5, [r4]
ldr r2, _0807C0C4 @ =gRoomControls
ldr r0, _0807C0C8 @ =gArea
@@ -853,7 +853,7 @@ _0807C01C:
lsls r2, r2, #2
adds r1, r1, r2
movs r2, #0x20
bl _DmaCopy
bl MemCopy
ldr r2, _0807C0D4 @ =gUsedPalettes
ldr r0, [r2]
movs r1, #0x80
@@ -873,7 +873,7 @@ _0807C04E:
adds r0, r7, #0
adds r1, r6, #0
mov r2, r8
bl _DmaFill16
bl MemFill16
movs r2, #0
ldr r3, _0807C0D8 @ =0x000007FF
adds r4, r7, #0
@@ -899,7 +899,7 @@ _0807C078:
ldr r4, _0807C0B8 @ =0x0000FFFF
adds r0, r4, #0
adds r1, r6, #0
bl _DmaFill16
bl MemFill16
movs r2, #0
ldr r3, _0807C0D8 @ =0x000007FF
_0807C096:
@@ -948,19 +948,19 @@ sub_0807C0DC: @ 0x0807C0DC
lsls r6, r6, #6
adds r0, r5, #0
adds r1, r6, #0
bl _DmaZero
bl MemClear32
adds r0, r5, r6
movs r1, #0x80
lsls r1, r1, #5
bl _DmaZero
bl MemClear32
ldr r0, _0807C160 @ =gUnk_02019EE0
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _0807C164 @ =gMapDataTopSpecial
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _0807C168 @ =gArea
ldr r1, _0807C16C @ =0x0000085C
adds r0, r0, r1
@@ -999,7 +999,7 @@ _0807C174: .4byte 0x0000FFFF
_0807C178:
adds r0, r2, #4
adds r1, r6, #0
bl _DmaZero
bl MemClear32
movs r3, #1
mov sb, r3
_0807C184:
@@ -1015,13 +1015,13 @@ _0807C184:
movs r4, #0x80
lsls r4, r4, #6
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
ldr r0, _0807C1B8 @ =gMapDataTop
movs r3, #0xc0
lsls r3, r3, #6
adds r1, r0, r3
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
b _0807C26C
.align 2, 0
_0807C1B0: .4byte gScreenTransition
@@ -1040,34 +1040,34 @@ _0807C1BC:
adds r0, r4, #0
mov r1, r8
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
movs r1, #0xc0
lsls r1, r1, #6
adds r6, r4, r1
adds r0, r6, #0
adds r1, r4, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
mov r0, r8
adds r1, r6, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
adds r6, r4, r5
adds r0, r6, #0
mov r1, r8
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
movs r2, #0x80
lsls r2, r2, #7
adds r4, r4, r2
adds r0, r4, #0
adds r1, r6, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
mov r0, r8
adds r1, r4, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
ldr r4, _0807C27C @ =gMapDataTop
movs r3, #0xb0
lsls r3, r3, #8
@@ -1076,34 +1076,34 @@ _0807C1BC:
adds r0, r4, #0
mov r1, r8
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
movs r0, #0xc0
lsls r0, r0, #6
adds r6, r4, r0
adds r0, r6, #0
adds r1, r4, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
mov r0, r8
adds r1, r6, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
adds r6, r4, r5
adds r0, r6, #0
mov r1, r8
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
movs r1, #0x80
lsls r1, r1, #7
adds r4, r4, r1
adds r0, r4, #0
adds r1, r6, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
mov r0, r8
adds r1, r4, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
_0807C26C:
mov r2, sb
cmp r2, #0
@@ -1161,25 +1161,25 @@ _0807C2E4:
adds r0, r4, #0
adds r1, r5, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
adds r0, r4, #0
adds r1, r5, #0
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl _DmaZero
bl MemClear32
ldr r4, _0807C350 @ =gMapDataTopSpecial
adds r5, r4, r6
adds r0, r4, #0
adds r1, r5, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
adds r0, r4, #0
adds r1, r5, #0
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl _DmaZero
bl MemClear32
_0807C326:
mov r1, sb
cmp r1, #0
@@ -1406,10 +1406,10 @@ sub_0807C4F8: @ 0x0807C4F8
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _0807C59C @ =gMapDataTopSpecial
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r5, _0807C5A0 @ =gUnk_02022830
ldr r0, _0807C5A4 @ =gArea
ldr r1, _0807C5A8 @ =0x0000085C
@@ -1449,25 +1449,25 @@ _0807C54A:
adds r0, r4, #0
adds r1, r5, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
adds r0, r4, #0
adds r1, r5, #0
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl _DmaZero
bl MemClear32
ldr r4, _0807C59C @ =gMapDataTopSpecial
adds r5, r4, r6
adds r0, r4, #0
adds r1, r5, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
adds r0, r4, #0
adds r1, r5, #0
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl _DmaZero
bl MemClear32
_0807C592:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -1694,7 +1694,7 @@ _0807C710:
_0807C726:
adds r0, r4, #0
movs r1, #0x40
bl _DmaZero
bl MemClear32
adds r4, #0x40
adds r5, #1
cmp r5, r7
@@ -1870,13 +1870,13 @@ sub_0807C860: @ 0x0807C860
movs r4, #0x80
lsls r4, r4, #6
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
ldr r0, _0807C894 @ =gMapDataTop
movs r2, #0xc0
lsls r2, r2, #6
adds r1, r0, r2
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
pop {r4, pc}
.align 2, 0
_0807C88C: .4byte gScreenTransition
@@ -1984,7 +1984,7 @@ _0807C92E:
_0807C946:
adds r0, r4, #0
movs r1, #0x80
bl _DmaZero
bl MemClear32
adds r4, #0x80
adds r5, #1
cmp r5, r6
asm/code_0807F0D8.s
+12 -12
View File
@@ -432,7 +432,7 @@ sub_0807F3C8: @ 0x0807F3C8
push {lr}
bl sub_0807F36C
movs r0, #0xe5
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
@@ -1598,8 +1598,8 @@ _0807FC32:
.align 2, 0
_0807FC3C: .4byte gRoomControls
thumb_func_start sub_0807FC40
sub_0807FC40: @ 0x0807FC40
thumb_func_start UpdateScroll
UpdateScroll: @ 0xUpdateScroll
push {lr}
ldr r0, _0807FC5C @ =gRoomControls
ldrb r2, [r0, #0xf]
@@ -1963,7 +1963,7 @@ sub_0807FEC8: @ 0x0807FEC8
ldr r4, _0807FEEC @ =gUnk_03003FC0
adds r1, r4, #0
movs r2, #0x40
bl _DmaFill32
bl MemFill32
subs r4, #0x40
ldr r1, [r5, #0x30]
ldrh r0, [r1, #0x2e]
@@ -2256,14 +2256,14 @@ sub_08080108: @ 0x08080108
lsls r6, r6, #6
adds r0, r5, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
ldr r4, _0808017C @ =gMapDataTop
movs r0, #0xc0
lsls r0, r0, #6
adds r1, r4, r0
adds r0, r4, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
bl sub_08080368
ldr r1, _08080180 @ =gUnk_02034480
ldr r0, _08080184 @ =gUnk_0200B640
@@ -2273,7 +2273,7 @@ sub_08080108: @ 0x08080108
ldr r1, _0808018C @ =gUnk_020246B0
movs r2, #0xc0
lsls r2, r2, #5
bl _DmaCopy
bl MemCopy
subs r5, #4
adds r0, r5, #0
bl sub_08080B60
@@ -2934,11 +2934,11 @@ sub_08080668: @ 0x08080668
ldr r5, _080806A4 @ =gRoomControls
adds r0, r5, #0
movs r1, #0x38
bl _DmaZero
bl MemClear32
ldr r4, _080806A8 @ =gUnk_03004030
adds r0, r4, #0
movs r1, #0xc
bl _DmaZero
bl MemClear32
ldr r0, _080806AC @ =0x0000FFFF
strh r0, [r5, #0x22]
movs r0, #0xff
@@ -2950,10 +2950,10 @@ sub_08080668: @ 0x08080668
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _080806B8 @ =gMapDataTopSpecial
adds r1, r4, #0
bl _DmaZero
bl MemClear32
pop {r4, r5, pc}
.align 2, 0
_080806A4: .4byte gRoomControls
@@ -3235,7 +3235,7 @@ _0808089A:
ldrh r0, [r4, #0x10]
cmp r0, #0
beq _080808B8
bl PlaySFX
bl SoundReq
_080808B8:
ldr r0, _080808D4 @ =gUnk_0811E7C4
ldrh r1, [r4]
asm/code_0808C964.s
+2 -2
View File
@@ -136,7 +136,7 @@ _0808CA40:
_0808CA50:
movs r0, #0x97
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _0808CA78
.align 2, 0
_0808CA5C: .4byte gUnk_02018EB0
@@ -151,7 +151,7 @@ _0808CA60:
strb r0, [r2, #0x1a]
movs r0, #0x97
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0808CA78:
ldrb r0, [r4, #9]
cmp r0, #0x75
asm/code_080A29BC.s
+3 -3
View File
@@ -610,7 +610,7 @@ _080A2F06:
bne _080A2F30
movs r0, #0x8c
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
movs r0, #8
str r0, [r4, #0x6c]
b _080A2F30
@@ -848,7 +848,7 @@ _080A30CC:
adds r0, r4, #0
bl sub_0806F69C
ldr r0, _080A30F4 @ =0x0000013F
bl PlaySFX
bl SoundReq
b _080A30FC
.align 2, 0
_080A30EC: .4byte gPlayerEntity
@@ -995,7 +995,7 @@ sub_080A3210: @ 0x080A3210
ldr r4, _080A3230 @ =gUnk_02021EE0
adds r0, r4, #0
movs r1, #0x18
bl _DmaZero
bl MemClear32
bl sub_080A35C8
movs r0, #0x80
lsls r0, r0, #1
asm/code_080A3480.s
+16 -16
View File
@@ -209,7 +209,7 @@ HandleCreditsScreen: @ 0x080A35E0
adds r0, #1
str r0, [r1]
ldr r1, _080A3600 @ =gUnk_08127D00
ldr r0, _080A3604 @ =gUnk_03001000
ldr r0, _080A3604 @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@@ -219,7 +219,7 @@ HandleCreditsScreen: @ 0x080A35E0
.align 2, 0
_080A35FC: .4byte gScreenTransition
_080A3600: .4byte gUnk_08127D00
_080A3604: .4byte gUnk_03001000
_080A3604: .4byte gMain
thumb_func_start sub_080A3608
sub_080A3608: @ 0x080A3608
@@ -230,7 +230,7 @@ sub_080A3608: @ 0x080A3608
strb r4, [r0, #6]
movs r0, #0x55
bl SetGlobalFlag
ldr r0, _080A3644 @ =gUnk_03001000
ldr r0, _080A3644 @ =gMain
strb r4, [r0, #3]
ldr r2, _080A3648 @ =gMenu
strb r5, [r2, #5]
@@ -251,7 +251,7 @@ sub_080A3608: @ 0x080A3608
b _080A365E
.align 2, 0
_080A3640: .4byte gSave
_080A3644: .4byte gUnk_03001000
_080A3644: .4byte gMain
_080A3648: .4byte gMenu
_080A364C: .4byte gUnk_08127998
_080A3650:
@@ -354,7 +354,7 @@ sub_080A36F8: @ 0x080A36F8
ldr r0, _080A3760 @ =gBG1Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
ldr r1, _080A3764 @ =gScreen
movs r2, #0
movs r0, #1
@@ -372,7 +372,7 @@ sub_080A36F8: @ 0x080A36F8
movs r0, #1
strb r0, [r5, #0x1a]
movs r0, #9
bl PlaySFX
bl SoundReq
_080A374A:
movs r0, #4
movs r1, #8
@@ -410,7 +410,7 @@ _080A378A:
ldr r0, _080A37B8 @ =gBG1Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
movs r1, #0x10
ldrsh r0, [r4, r1]
ldr r2, _080A37BC @ =gUnk_081272E0
@@ -580,7 +580,7 @@ sub_080A38D0: @ 0x080A38D0
movs r6, #0x80
lsls r6, r6, #4
adds r1, r6, #0
bl _DmaZero
bl MemClear32
ldr r4, _080A3924 @ =gScreen
movs r0, #0
mov r8, r0
@@ -588,7 +588,7 @@ sub_080A38D0: @ 0x080A38D0
strh r5, [r4, #0x1a]
ldr r0, _080A3928 @ =gBG2Buffer
adds r1, r6, #0
bl _DmaZero
bl MemClear32
strh r5, [r4, #0x26]
adds r4, #0x68
movs r0, #0x80
@@ -621,14 +621,14 @@ sub_080A3930: @ 0x080A3930
movs r0, #7
movs r1, #8
bl DoFade
ldr r1, _080A3950 @ =gUnk_03001000
ldr r1, _080A3950 @ =gMain
movs r0, #2
strb r0, [r1, #3]
_080A3948:
pop {pc}
.align 2, 0
_080A394C: .4byte gFadeControl
_080A3950: .4byte gUnk_03001000
_080A3950: .4byte gMain
thumb_func_start sub_080A3954
sub_080A3954: @ 0x080A3954
@@ -712,7 +712,7 @@ _080A39C8:
movs r0, #0xc0
lsls r0, r0, #0x13
movs r1, #0x20
bl _DmaZero
bl MemClear32
movs r0, #0
movs r1, #0
bl sub_08052418
@@ -790,7 +790,7 @@ _080A3A8C:
movs r0, #0x3c
strh r0, [r1, #8]
movs r0, #0x6a
bl PlaySFX
bl SoundReq
_080A3A9A:
ldr r1, _080A3AB4 @ =gMenu
ldrb r0, [r1, #3]
@@ -801,7 +801,7 @@ _080A3A9A:
adds r1, r4, #0
bl sub_08052418
movs r0, #0x69
bl PlaySFX
bl SoundReq
b _080A3B36
.align 2, 0
_080A3AB4: .4byte gMenu
@@ -862,7 +862,7 @@ _080A3B14:
movs r0, #7
movs r1, #8
bl DoFade
ldr r1, _080A3B40 @ =gUnk_03001000
ldr r1, _080A3B40 @ =gMain
movs r0, #3
strb r0, [r1, #3]
ldr r0, _080A3B44 @ =gMenu
@@ -872,7 +872,7 @@ _080A3B36:
.align 2, 0
_080A3B38: .4byte gScreen
_080A3B3C: .4byte 0x0000FDFF
_080A3B40: .4byte gUnk_03001000
_080A3B40: .4byte gMain
_080A3B44: .4byte gMenu
thumb_func_start sub_080A3B48
asm/code_080A3BD0.s
+41 -41
View File
@@ -84,7 +84,7 @@ _080A3CF0:
beq _080A3CFE
strb r1, [r3]
movs r0, #0x69
bl PlaySFX
bl SoundReq
_080A3CFE:
ldr r2, _080A3D28 @ =gInput
ldrh r1, [r2, #2]
@@ -95,7 +95,7 @@ _080A3CFE:
movs r0, #2
bl sub_080A7114
movs r0, #0x6c
bl PlaySFX
bl SoundReq
b _080A3DA8
.align 2, 0
_080A3D18: .4byte 0x0001FFFF
@@ -276,7 +276,7 @@ sub_080A3E48: @ 0x080A3E48
beq _080A3E84
movs r0, #0x8c
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
movs r0, #4
bl sub_080A7114
b _080A3EC8
@@ -317,7 +317,7 @@ _080A3E84:
adds r0, #0x6a
strh r2, [r0]
movs r0, #0xfa
bl PlaySFX
bl SoundReq
_080A3EC8:
pop {r4, pc}
.align 2, 0
@@ -379,7 +379,7 @@ sub_080A3F10: @ 0x080A3F10
movs r0, #1
bl sub_080A7114
movs r0, #0x6d
bl PlaySFX
bl SoundReq
_080A3F46:
pop {r4, pc}
.align 2, 0
@@ -427,7 +427,7 @@ sub_080A3F68: @ 0x080A3F68
_080A3F96:
bl sub_080A4468
movs r0, #0xcd
bl PlaySFX
bl SoundReq
ldr r0, _080A3FC8 @ =0x00000702
movs r1, #0xe
bl sub_080563C8
@@ -457,7 +457,7 @@ sub_080A3FCC: @ 0x080A3FCC
movs r1, #2
strb r1, [r0, #6]
ldr r0, _080A3FF0 @ =0x00000147
bl PlaySFX
bl SoundReq
_080A3FE6:
pop {pc}
.align 2, 0
@@ -497,7 +497,7 @@ _080A4018:
bl CreateObject
movs r0, #0xe5
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_080A4036:
pop {pc}
@@ -585,7 +585,7 @@ sub_080A4080: @ 0x080A4080
adds r0, r7, #0
movs r1, #1
bl sub_080ADA14
ldr r0, _080A4140 @ =gUnk_03001000
ldr r0, _080A4140 @ =gMain
ldrh r0, [r0, #0xc]
lsrs r0, r0, #2
movs r1, #0xe
@@ -634,7 +634,7 @@ _080A4130:
_080A4134: .4byte gOamCmd
_080A4138: .4byte gMenu
_080A413C: .4byte 0x000001FB
_080A4140: .4byte gUnk_03001000
_080A4140: .4byte gMain
_080A4144: .4byte gUnk_08128110
_080A4148: .4byte 0x0000FFFF
@@ -935,7 +935,7 @@ sub_080A4398: @ 0x080A4398
push {lr}
ldr r0, _080A43A4 @ =gUnk_02019EE0
movs r1, #0x40
bl _DmaZero
bl MemClear32
pop {pc}
.align 2, 0
_080A43A4: .4byte gUnk_02019EE0
@@ -1119,7 +1119,7 @@ sub_080A44E0: @ 0x080A44E0
mov r8, r0
ldr r0, [r4, #8]
mov r1, r8
bl _DmaZero
bl MemClear32
adds r0, r6, #0
adds r1, r4, #0
bl sub_0805F76C
@@ -1130,7 +1130,7 @@ sub_080A44E0: @ 0x080A44E0
adds r5, r5, r1
adds r1, r5, #0
mov r2, r8
bl _DmaCopy
bl MemCopy
adds r0, r6, #0
pop {r3}
mov r8, r3
@@ -1174,7 +1174,7 @@ _080A4550:
b _080A4576
_080A456A:
adds r0, r4, #0
bl sub_0804A57C
bl EnemyInit
ldrb r0, [r4, #9]
strb r0, [r4, #0xf]
movs r0, #0x66
@@ -1269,11 +1269,11 @@ sub_080A4608: @ 0x080A4608
ldr r0, _080A46A4 @ =gBG0Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
ldr r0, _080A46A8 @ =gBG3Buffer
movs r1, #0x80
lsls r1, r1, #5
bl _DmaZero
bl MemClear32
ldr r2, _080A46AC @ =gScreen
adds r1, r2, #0
adds r1, #0x58
@@ -1336,7 +1336,7 @@ sub_080A46C0: @ 0x080A46C0
lsls r0, r0, #1
bl sub_080A3248
movs r0, #0x6c
bl PlaySFX
bl SoundReq
movs r0, #2
bl ClearRoomFlag
bl sub_080A71DC
@@ -1456,7 +1456,7 @@ _080A4788:
adds r1, #0x9c
_080A47BE:
adds r0, r1, #0
bl PlaySFX
bl SoundReq
_080A47C4:
pop {r4, pc}
.align 2, 0
@@ -1631,7 +1631,7 @@ _080A48F6:
beq _080A490E
strb r4, [r6, #0x1c]
movs r0, #0x69
bl PlaySFX
bl SoundReq
movs r0, #2
bl sub_080A7114
movs r5, #0
@@ -1755,7 +1755,7 @@ _080A49D6:
adds r0, r7, #0
movs r1, #1
bl sub_080ADA14
ldr r0, _080A4B28 @ =gUnk_03001000
ldr r0, _080A4B28 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x10
ands r0, r1
@@ -1777,7 +1777,7 @@ _080A49F4:
adds r0, r7, #0
bl sub_080ADA14
_080A4A10:
ldr r0, _080A4B28 @ =gUnk_03001000
ldr r0, _080A4B28 @ =gMain
ldrh r1, [r0, #0xc]
movs r2, #0x10
adds r0, r2, #0
@@ -1910,12 +1910,12 @@ _080A4ABE:
_080A4B1C: .4byte gOamCmd
_080A4B20: .4byte gSave
_080A4B24: .4byte gMenu
_080A4B28: .4byte gUnk_03001000
_080A4B28: .4byte gMain
_080A4B2C: .4byte gUnk_081281A8
_080A4B30: .4byte 0x06014000
_080A4B34:
ldr r1, _080A4B40 @ =0x06014000
bl LoadAssetAsync
bl LoadResourceAsync
_080A4B3A:
pop {r3}
mov r8, r3
@@ -1976,16 +1976,16 @@ sub_080A4BA0: @ 0x080A4BA0
adds r6, r1, #0
add r0, sp, #0x18
movs r1, #0x30
bl _DmaZero
bl MemClear32
ldr r0, _080A4C08 @ =gUnk_0812816C
mov r1, sp
movs r2, #0x18
bl _DmaCopy
bl MemCopy
ldr r0, _080A4C0C @ =gUnk_08128184
add r4, sp, #0x48
adds r1, r4, #0
movs r2, #0xc
bl _DmaCopy
bl MemCopy
lsls r1, r6, #1
adds r1, r1, r6
lsls r2, r1, #9
@@ -2062,7 +2062,7 @@ _080A4C3E:
_080A4C56:
ldr r1, [sp]
movs r2, #0x80
bl _DmaFill16
bl MemFill16
cmp r5, #0
ble _080A4CAC
ldr r0, _080A4C9C @ =0x00007FFF
@@ -2123,11 +2123,11 @@ sub_080A4CBC: @ 0x080A4CBC
lsls r5, r5, #4
adds r0, r4, #0
adds r1, r5, #0
bl _DmaZero
bl MemClear32
ldr r1, _080A4D14 @ =0x0600E000
adds r0, r4, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
adds r0, r6, #0
bl sub_080A4948
cmp r0, #0
@@ -2217,7 +2217,7 @@ sub_080A4D88: @ 0x080A4D88
push {lr}
ldr r0, _080A4DA4 @ =gUnk_020344A0
movs r1, #8
bl _DmaZero
bl MemClear32
movs r0, #1
movs r1, #0
bl MenuFadeIn
@@ -2245,21 +2245,21 @@ sub_080A4DB8: @ 0x080A4DB8
movs r4, #0x80
lsls r4, r4, #4
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _080A4E5C @ =gBG1Buffer
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _080A4E60 @ =gBG2Buffer
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _080A4E64 @ =gUnk_0200AF34
movs r1, #0xc0
lsls r1, r1, #2
bl _DmaZero
bl MemClear32
ldr r4, _080A4E68 @ =gMenu
adds r0, r4, #0
movs r1, #0x30
bl _DmaZero
bl MemClear32
ldr r0, _080A4E6C @ =0x0000FFFF
strh r0, [r4, #0x2e]
ldr r0, _080A4E70 @ =gUnk_02034490
@@ -2552,7 +2552,7 @@ _080A5042:
movs r4, #0
strb r5, [r0, #0x14]
movs r0, #0x65
bl PlaySFX
bl SoundReq
ldr r0, _080A5078 @ =gMenu
str r4, [r0, #0xc]
_080A5052:
@@ -2580,7 +2580,7 @@ _080A5080:
ldr r0, _080A5098 @ =gBG0Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
ldr r1, _080A509C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
@@ -2910,7 +2910,7 @@ _080A52EC:
bl ForceEquipItem
_080A530A:
movs r0, #0x6a
bl PlaySFX
bl SoundReq
b _080A5336
.align 2, 0
_080A5314: .4byte gMenu
@@ -2942,7 +2942,7 @@ _080A5336:
beq _080A5346
strb r4, [r5, #3]
movs r0, #0x69
bl PlaySFX
bl SoundReq
_080A5346:
adds r0, r5, #0
adds r0, #0x10
@@ -3116,7 +3116,7 @@ _080A547C:
ldrb r0, [r1, #7]
strh r0, [r4, #2]
ldrb r2, [r1, #4]
ldr r0, _080A5540 @ =gUnk_03001000
ldr r0, _080A5540 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x10
ands r0, r1
@@ -3198,6 +3198,6 @@ _080A5530: .4byte gOamCmd
_080A5534: .4byte gUnk_080FDFD8
_080A5538: .4byte gMenu
_080A553C: .4byte gUnk_08128B64
_080A5540: .4byte gUnk_03001000
_080A5540: .4byte gMain
_080A5544: .4byte 0x000001FB
_080A5548: .4byte gSave
asm/code_080A5574.s
+95 -95
View File
@@ -193,7 +193,7 @@ _080A56F8:
ldr r0, _080A5708 @ =gMenu
strb r3, [r0, #3]
movs r0, #0x69
bl PlaySFX
bl SoundReq
b _080A575E
.align 2, 0
_080A5708: .4byte gMenu
@@ -242,7 +242,7 @@ _080A5752:
adds r0, r1, #0
bl sub_080A4E84
movs r0, #0x6a
bl PlaySFX
bl SoundReq
_080A575E:
ldr r0, _080A5780 @ =gMenu
ldrb r1, [r0, #3]
@@ -354,7 +354,7 @@ _080A581A:
ldrb r0, [r3, #7]
strh r0, [r2, #2]
ldrb r2, [r3, #4]
ldr r0, _080A58A0 @ =gUnk_03001000
ldr r0, _080A58A0 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x10
ands r0, r1
@@ -405,7 +405,7 @@ _080A5890: .4byte gOamCmd
_080A5894: .4byte gUnk_08128C94
_080A5898: .4byte gUnk_08128C14
_080A589C: .4byte gMenu
_080A58A0: .4byte gUnk_03001000
_080A58A0: .4byte gMain
_080A58A4: .4byte 0x000001FB
_080A58A8:
ldrb r0, [r6]
@@ -606,13 +606,13 @@ _080A5A10:
movs r0, #2
bl sub_080A7114
movs r0, #0x6a
bl PlaySFX
bl SoundReq
b _080A5A52
_080A5A2E:
movs r0, #3
bl sub_080A7114
movs r0, #0x6c
bl PlaySFX
bl SoundReq
b _080A5A52
_080A5A3C:
ldrb r0, [r1, #3]
@@ -623,7 +623,7 @@ _080A5A3C:
adds r1, r2, #0
bl sub_08052418
movs r0, #0x69
bl PlaySFX
bl SoundReq
_080A5A52:
pop {pc}
@@ -796,7 +796,7 @@ _080A5B76:
adds r1, r4, #0
bl sub_08052418
movs r0, #0x69
bl PlaySFX
bl SoundReq
_080A5B8E:
cmp r5, #0
beq _080A5BB6
@@ -812,7 +812,7 @@ _080A5B8E:
b _080A5BB6
_080A5BAA:
movs r0, #0x6c
bl PlaySFX
bl SoundReq
movs r0, #2
bl sub_080A4E84
_080A5BB6:
@@ -826,7 +826,7 @@ sub_080A5BB8: @ 0x080A5BB8
cmp r0, #0
bne _080A5BE2
bl sub_08050384
ldr r1, _080A5BE8 @ =gUnk_03001000
ldr r1, _080A5BE8 @ =gMain
ldrb r0, [r1, #1]
movs r0, #1
strb r0, [r1, #1]
@@ -842,7 +842,7 @@ _080A5BE2:
pop {pc}
.align 2, 0
_080A5BE4: .4byte gFadeControl
_080A5BE8: .4byte gUnk_03001000
_080A5BE8: .4byte gMain
_080A5BEC: .4byte gUnk_02034490
thumb_func_start sub_080A5BF0
@@ -856,7 +856,7 @@ sub_080A5BF0: @ 0x080A5BF0
ldr r0, [r0]
bl _call_via_r0
bl sub_080A5D1C
ldr r0, _080A5C38 @ =gUnk_03001000
ldr r0, _080A5C38 @ =gMain
ldrh r0, [r0, #0xc]
movs r1, #7
ands r0, r1
@@ -867,7 +867,7 @@ sub_080A5BF0: @ 0x080A5BF0
adds r0, r4, #2
adds r1, r4, #0
movs r2, #0xe
bl _DmaCopy
bl MemCopy
strh r5, [r4, #0xe]
ldr r2, _080A5C40 @ =gUsedPalettes
ldr r0, [r2]
@@ -880,7 +880,7 @@ _080A5C2E:
.align 2, 0
_080A5C30: .4byte gUnk_08128D30
_080A5C34: .4byte gMenu
_080A5C38: .4byte gUnk_03001000
_080A5C38: .4byte gMain
_080A5C3C: .4byte gUnk_02017830
_080A5C40: .4byte gUsedPalettes
@@ -967,7 +967,7 @@ _080A5CE6:
adds r0, r2, #0
bl sub_080A5CFC
movs r0, #0x69
bl PlaySFX
bl SoundReq
_080A5CFA:
pop {pc}
@@ -1020,7 +1020,7 @@ sub_080A5D1C: @ 0x080A5D1C
lsls r0, r0, #2
adds r0, r6, r0
strh r0, [r5, #2]
ldr r1, _080A5EAC @ =gUnk_03001000
ldr r1, _080A5EAC @ =gMain
mov sl, r1
ldrh r1, [r1, #0xc]
movs r0, #0x10
@@ -1181,7 +1181,7 @@ _080A5E9C: .4byte gUnk_080C9C6C
_080A5EA0: .4byte gUnk_08128D3C
_080A5EA4: .4byte gOamCmd
_080A5EA8: .4byte gMenu
_080A5EAC: .4byte gUnk_03001000
_080A5EAC: .4byte gMain
_080A5EB0: .4byte 0x000001FB
_080A5EB4: .4byte gUnk_080FDFD8
_080A5EB8: .4byte gUnk_02019EE0
@@ -1535,7 +1535,7 @@ _080A6164:
beq _080A6178
strb r2, [r1, #3]
movs r0, #0x69
bl PlaySFX
bl SoundReq
_080A6178:
pop {pc}
.align 2, 0
@@ -1564,7 +1564,7 @@ sub_080A617C: @ 0x080A617C
subs r0, r0, r1
adds r0, #0x1a
strh r0, [r6]
ldr r0, _080A6268 @ =gUnk_03001000
ldr r0, _080A6268 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x20
ands r0, r1
@@ -1655,7 +1655,7 @@ _080A6250:
.align 2, 0
_080A6260: .4byte gOamCmd
_080A6264: .4byte gMenu
_080A6268: .4byte gUnk_03001000
_080A6268: .4byte gMain
_080A626C: .4byte gUnk_08128D70
thumb_func_start sub_080A6270
@@ -1749,7 +1749,7 @@ _080A6326:
cmp r0, #0
beq _080A635A
movs r0, #0x6a
bl PlaySFX
bl SoundReq
movs r0, #6
bl sub_080A4E84
b _080A635A
@@ -1778,7 +1778,7 @@ _080A635A:
ldr r0, _080A6374 @ =gMenu
strb r4, [r0, #3]
movs r0, #0x69
bl PlaySFX
bl SoundReq
_080A6368:
ldr r0, _080A6374 @ =gMenu
ldrb r0, [r0, #3]
@@ -2077,7 +2077,7 @@ sub_080A65AC: @ 0x080A65AC
movs r0, #0x20
strb r0, [r1]
adds r0, #0xe3
bl PlaySFX
bl SoundReq
_080A65DA:
ldrh r0, [r4, #8]
subs r0, #1
@@ -2442,7 +2442,7 @@ _080A6886:
ldr r0, _080A68D0 @ =gUnk_02019EE0
movs r1, #0x80
lsls r1, r1, #3
bl _DmaZero
bl MemClear32
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A68AC: .4byte gUnk_02032EC0
@@ -2790,7 +2790,7 @@ sub_080A6B04: @ 0x080A6B04
ldr r1, _080A6C08 @ =gBG3Buffer
movs r2, #0x80
lsls r2, r2, #5
bl _DmaFill16
bl MemFill16
ldr r0, _080A6C0C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #8
@@ -2897,7 +2897,7 @@ _080A6C50:
_080A6C58: .4byte gInput
_080A6C5C:
ldr r0, _080A6C6C @ =0x00000103
bl PlaySFX
bl SoundReq
_080A6C62:
ldr r1, _080A6C70 @ =gMenu
ldrh r0, [r1, #8]
@@ -3029,7 +3029,7 @@ _080A6D58:
beq _080A6D6E
strb r0, [r1, #3]
movs r0, #0x69
bl PlaySFX
bl SoundReq
_080A6D6E:
pop {r4, pc}
.align 2, 0
@@ -3139,7 +3139,7 @@ _080A6E18:
movs r0, #0
strb r0, [r1]
movs r0, #0x6c
bl PlaySFX
bl SoundReq
_080A6E3A:
pop {pc}
.align 2, 0
@@ -3307,7 +3307,7 @@ sub_080A6F6C: @ 0x080A6F6C
ldr r0, _080A6FA8 @ =gUnk_020350F0
movs r1, #0x80
lsls r1, r1, #1
bl _DmaZero
bl MemClear32
movs r0, #0xff
ands r0, r4
cmp r0, #0
@@ -3376,7 +3376,7 @@ _080A6FFA:
ldr r0, _080A7038 @ =gUnk_020350F0
movs r1, #0x80
lsls r1, r1, #1
bl _DmaZero
bl MemClear32
movs r0, #0xff
ands r0, r4
cmp r0, #0
@@ -3413,14 +3413,14 @@ sub_080A7040: @ 0x080A7040
movs r1, #0xc0
lsls r1, r1, #2
adds r0, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _080A7098 @ =0xFFFFFE00
adds r4, r4, r0
ldr r1, _080A709C @ =0x0600E000
movs r2, #0x80
lsls r2, r2, #4
adds r0, r4, #0
bl _DmaCopy
bl MemCopy
ldr r1, _080A70A0 @ =gUnk_08128D70
lsls r0, r5, #3
adds r4, r0, r1
@@ -3456,7 +3456,7 @@ sub_080A70AC: @ 0x080A70AC
movs r1, #0xc0
lsls r1, r1, #2
adds r0, r4, #0
bl _DmaZero
bl MemClear32
adds r2, r4, #0
subs r2, #0x34
movs r0, #0x7f
@@ -3519,7 +3519,7 @@ sub_080A7124: @ 0x080A7124
ldr r0, _080A7134 @ =gUnk_02032EC0
movs r1, #0xed
lsls r1, r1, #2
bl _DmaZero
bl MemClear32
pop {pc}
.align 2, 0
_080A7134: .4byte gUnk_02032EC0
@@ -3536,16 +3536,16 @@ MenuFadeIn: @ 0x080A7138
movs r1, #0xed
lsls r1, r1, #2
adds r0, r4, #0
bl _DmaZero
bl MemClear32
strb r5, [r4, #2]
strb r6, [r4, #3]
ldr r0, _080A7160 @ =gUnk_03001000
ldr r0, _080A7160 @ =gMain
ldrb r0, [r0, #4]
strb r0, [r4, #7]
b _080A716C
.align 2, 0
_080A715C: .4byte gUnk_02032EC0
_080A7160: .4byte gUnk_03001000
_080A7160: .4byte gMain
_080A7164:
strb r5, [r4, #4]
strb r6, [r4, #5]
@@ -3560,7 +3560,7 @@ _080A716C:
movs r4, #0
movs r0, #0x20
strh r0, [r1, #0xa]
ldr r1, _080A719C @ =gUnk_03001000
ldr r1, _080A719C @ =gMain
movs r0, #7
strb r0, [r1, #4]
movs r0, #5
@@ -3573,7 +3573,7 @@ _080A716C:
.align 2, 0
_080A7194: .4byte gUnk_02032EC0
_080A7198: .4byte 0x0000FFFF
_080A719C: .4byte gUnk_03001000
_080A719C: .4byte gMain
_080A71A0: .4byte gUnk_02018EB0
thumb_func_start sub_080A71A4
@@ -3632,14 +3632,14 @@ _080A71FE:
bl DeleteAllEntities
bl sub_0805E974
bl DeleteAllEntities
ldr r0, _080A7218 @ =gUnk_03001000
ldr r0, _080A7218 @ =gMain
movs r2, #0
movs r1, #1
strb r1, [r0, #3]
strb r2, [r0, #4]
pop {pc}
.align 2, 0
_080A7218: .4byte gUnk_03001000
_080A7218: .4byte gMain
thumb_func_start sub_080A721C
sub_080A721C: @ 0x080A721C
@@ -3679,42 +3679,42 @@ sub_080A7250: @ 0x080A7250
ldr r0, _080A72EC @ =gScreen
ldr r1, _080A72F0 @ =gUnk_03001020
movs r2, #0x7c
bl _DmaCopy
bl MemCopy
ldr r0, _080A72F4 @ =gPaletteBuffer
ldr r1, _080A72F8 @ =gUnk_02024090
movs r2, #0x80
lsls r2, r2, #3
bl _DmaCopy
bl MemCopy
ldr r0, _080A72FC @ =gUnk_02024490
ldr r4, _080A7300 @ =gUnk_02032F14
movs r2, #0x85
lsls r2, r2, #2
adds r1, r4, #0
bl _DmaCopy
bl MemCopy
ldr r0, _080A7304 @ =gUnk_02001A00
movs r2, #0x85
lsls r2, r2, #2
adds r1, r4, r2
movs r2, #0x40
bl _DmaCopy
bl MemCopy
ldr r0, _080A7308 @ =gRoomControls
adds r1, r4, #0
subs r1, #0x38
movs r2, #0x38
bl _DmaCopy
bl MemCopy
ldr r0, _080A730C @ =gUnk_03000420
movs r2, #0x95
lsls r2, r2, #2
adds r1, r4, r2
movs r2, #0x80
lsls r2, r2, #1
bl _DmaCopy
bl MemCopy
ldr r0, _080A7310 @ =gUnk_02033280
movs r2, #0xd5
lsls r2, r2, #2
adds r1, r4, r2
movs r2, #0xc
bl _DmaCopy
bl MemCopy
bl sub_0805E958
adds r1, r4, #0
subs r1, #0x54
@@ -3767,23 +3767,23 @@ sub_080A7328: @ 0x080A7328
bl DeleteAllEntities
ldr r0, _080A738C @ =gMenu
movs r1, #0x30
bl _DmaZero
bl MemClear32
ldr r0, _080A7390 @ =gRoomControls
movs r1, #0x38
bl _DmaZero
bl MemClear32
ldr r0, _080A7394 @ =gUnk_03000420
movs r1, #0x80
lsls r1, r1, #1
bl _DmaZero
bl MemClear32
ldr r4, _080A7398 @ =gUnk_02033280
adds r0, r4, #0
movs r1, #0xc
bl _DmaZero
bl MemClear32
movs r0, #8
strb r0, [r4, #8]
movs r0, #1
bl sub_0801DA90
bl sub_08056418
bl MessageInitialize
bl sub_080ADD30
movs r0, #0
bl sub_0801CFA8
@@ -3838,36 +3838,36 @@ _080A73B4:
adds r0, r5, r1
ldr r1, _080A7480 @ =gUnk_02033280
movs r2, #0xc
bl _DmaCopy
bl MemCopy
movs r1, #0xaa
lsls r1, r1, #2
adds r0, r5, r1
ldr r1, _080A7484 @ =gUnk_03000420
movs r2, #0x80
lsls r2, r2, #1
bl _DmaCopy
bl MemCopy
movs r1, #0x9a
lsls r1, r1, #2
adds r0, r5, r1
ldr r1, _080A7488 @ =gUnk_02001A00
movs r2, #0x40
bl _DmaCopy
bl MemCopy
adds r0, r5, #0
adds r0, #0x54
ldr r1, _080A748C @ =gUnk_02024490
movs r2, #0x85
lsls r2, r2, #2
bl _DmaCopy
bl MemCopy
adds r0, r5, #0
adds r0, #0x1c
ldr r4, _080A7490 @ =gRoomControls
adds r1, r4, #0
movs r2, #0x38
bl _DmaCopy
bl MemCopy
ldr r0, _080A7494 @ =gUnk_03001020
ldr r1, _080A7498 @ =gScreen
movs r2, #0x7c
bl _DmaCopy
bl MemCopy
ldrb r0, [r4, #4]
bl sub_08052D58
ldr r4, _080A749C @ =gArea
@@ -3934,7 +3934,7 @@ sub_080A74C8: @ 0x080A74C8
ldrb r3, [r0]
cmp r3, #0
bne _080A74E6
ldr r0, _080A74EC @ =gUnk_03001000
ldr r0, _080A74EC @ =gMain
ldr r1, _080A74F0 @ =gUnk_02032EC0
ldrb r2, [r1, #7]
strb r2, [r0, #4]
@@ -3945,14 +3945,14 @@ _080A74E6:
pop {pc}
.align 2, 0
_080A74E8: .4byte gFadeControl
_080A74EC: .4byte gUnk_03001000
_080A74EC: .4byte gMain
_080A74F0: .4byte gUnk_02032EC0
thumb_func_start sub_080A74F4
sub_080A74F4: @ 0x080A74F4
push {lr}
bl sub_0805E5A8
ldr r1, _080A7524 @ =gUnk_03001000
ldr r1, _080A7524 @ =gMain
movs r0, #0
strb r0, [r1, #0xb]
bl FlushSprites
@@ -3965,7 +3965,7 @@ sub_080A74F4: @ 0x080A74F4
bl sub_080AD918
pop {pc}
.align 2, 0
_080A7524: .4byte gUnk_03001000
_080A7524: .4byte gMain
thumb_func_start sub_080A7528
sub_080A7528: @ 0x080A7528
@@ -4038,7 +4038,7 @@ sub_080A758C: @ 0x080A758C
bl DeleteThisEntity
_080A75AC:
adds r0, r5, #0
bl sub_0806FBD8
bl AllocMutableHitbox
cmp r0, #0
bne _080A75BA
bl DeleteThisEntity
@@ -4161,7 +4161,7 @@ _080A7692:
lsls r0, r0, #1
adds r0, r0, r4
ldrh r0, [r0]
bl PlaySFX
bl SoundReq
b _080A76C2
.align 2, 0
_080A76B0: .4byte gPlayerState
@@ -4173,7 +4173,7 @@ _080A76BC:
_080A76C2:
movs r0, #0x87
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
pop {r4, r5, pc}
thumb_func_start sub_080A76CC
@@ -4237,7 +4237,7 @@ _080A7728:
beq _080A77C4
movs r0, #0x8b
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _080A77C4
.align 2, 0
_080A7740: .4byte gPlayerEntity
@@ -4401,7 +4401,7 @@ _080A7868:
cmp r0, #0
beq _080A7880
movs r0, #0x77
bl PlaySFX
bl SoundReq
_080A7880:
ldrb r0, [r4, #0x1e]
cmp r0, #0x8a
@@ -4943,7 +4943,7 @@ sub_080A7C7C: @ 0x080A7C7C
push {lr}
ldr r0, _080A7C88 @ =gUnk_02017660
movs r1, #0x40
bl _DmaZero
bl MemClear32
pop {pc}
.align 2, 0
_080A7C88: .4byte gUnk_02017660
@@ -4999,7 +4999,7 @@ _080A7CDC:
movs r1, #0x78
bl sub_0805E4E0
ldr r0, _080A7CF8 @ =0x0000011B
bl PlaySFX
bl SoundReq
_080A7CF4:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -5935,7 +5935,7 @@ _080A836E:
sub_080A83A0: @ 0x080A83A0
push {r4, lr}
adds r4, r0, #0
bl sub_0806FBD8
bl AllocMutableHitbox
cmp r0, #0
beq _080A83B0
movs r0, #1
@@ -7385,7 +7385,7 @@ sub_080A8E28: @ 0x080A8E28
movs r1, #0x51
bl InitializeAnimation
ldr r0, _080A8E84 @ =0x000001B5
bl PlaySFX
bl SoundReq
_080A8E6E:
ldrb r4, [r5, #0xa]
cmp r4, #2
@@ -8083,7 +8083,7 @@ _080A93BE:
strb r0, [r4, #0x10]
str r2, [r5, #0x54]
movs r0, #0xfc
bl PlaySFX
bl SoundReq
_080A93DA:
pop {r4, r5, pc}
@@ -8268,7 +8268,7 @@ sub_080A9518: @ 0x080A9518
movs r1, #0
bl InitializeAnimation
ldr r0, _080A953C @ =0x00000149
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_080A953C: .4byte 0x00000149
@@ -8541,7 +8541,7 @@ _080A9718:
bl InitializeAnimation
_080A9756:
ldr r0, _080A9768 @ =0x000001B5
bl PlaySFX
bl SoundReq
pop {r4, r5, pc}
.align 2, 0
_080A9760: .4byte gPlayerEntity
@@ -8662,7 +8662,7 @@ _080A9804:
strb r0, [r1]
_080A983C:
ldr r0, _080A98B8 @ =0x00000127
bl PlaySFX
bl SoundReq
adds r0, r4, #0
bl sub_080A99F0
_080A9848:
@@ -8714,7 +8714,7 @@ _080A989A:
_080A98A4:
movs r0, #0xb2
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
ldrh r0, [r5]
cmp r0, #0
bne _080A98BC
@@ -10572,7 +10572,7 @@ sub_080AA654: @ 0x080AA654
ldr r0, _080AA688 @ =gUnk_0812A004
adds r1, r4, #0
movs r2, #0x10
bl _DmaCopy
bl MemCopy
movs r1, #0x3f
adds r0, r5, #0
ands r0, r1
@@ -11416,7 +11416,7 @@ _080AACB4: .4byte gPlayerState
_080AACB8: .4byte gPlayerEntity
_080AACBC:
ldr r0, _080AACDC @ =0x00000119
bl PlaySFX
bl SoundReq
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl CopyPosition
@@ -12330,7 +12330,7 @@ sub_080AB318: @ 0x080AB318
movs r1, #0x51
bl InitializeAnimation
ldr r0, _080AB3E0 @ =0x000001B5
bl PlaySFX
bl SoundReq
adds r0, r6, #0
bl sub_080AB4F8
movs r1, #0x2e
@@ -13189,7 +13189,7 @@ sub_080AB9DC: @ 0x080AB9DC
adds r1, r4, #0
adds r1, #0x68
movs r2, #0x1c
bl _DmaCopy
bl MemCopy
ldrh r1, [r4, #0x2e]
adds r0, r4, #0
adds r0, #0x84
@@ -13637,7 +13637,7 @@ sub_080ABCC4: @ 0x080ABCC4
movs r1, #0
bl InitializeAnimation
ldr r0, _080ABD40 @ =0x0000014B
bl PlaySFX
bl SoundReq
pop {r4, r5, pc}
.align 2, 0
_080ABD3C: .4byte gRoomControls
@@ -13799,7 +13799,7 @@ _080ABE56:
movs r1, #0
bl InitializeAnimation
ldr r0, _080ABE84 @ =0x0000012D
bl PlaySFX
bl SoundReq
pop {r4, r5, pc}
.align 2, 0
_080ABE84: .4byte 0x0000012D
@@ -13860,7 +13860,7 @@ _080ABEEC:
movs r1, #0
bl InitializeAnimation
ldr r0, _080ABF00 @ =0x00000193
bl PlaySFX
bl SoundReq
pop {r4, pc}
.align 2, 0
_080ABEFC: .4byte 0x0000013F
@@ -13914,7 +13914,7 @@ sub_080ABF40: @ 0x080ABF40
movs r1, #0
bl InitializeAnimation
ldr r0, _080ABFA4 @ =0x00000199
bl PlaySFX
bl SoundReq
_080ABF66:
ldrh r2, [r4, #0x36]
movs r0, #0x36
@@ -14051,7 +14051,7 @@ _080AC058:
strh r0, [r4, #0x36]
ldr r0, _080AC070 @ =0x00000149
_080AC06A:
bl PlaySFX
bl SoundReq
pop {r4, pc}
.align 2, 0
_080AC070: .4byte 0x00000149
@@ -14086,7 +14086,7 @@ _080AC084:
cmp r0, #0
bne _080AC0B2
ldr r0, _080AC0E8 @ =0x00000149
bl PlaySFX
bl SoundReq
_080AC0B2:
adds r0, r4, #0
bl GetNextFrame
@@ -14110,7 +14110,7 @@ _080AC0B2:
lsls r0, r0, #1
strh r0, [r4, #0x24]
adds r0, #0x13
bl PlaySFX
bl SoundReq
b _080AC0F8
.align 2, 0
_080AC0E8: .4byte 0x00000149
@@ -14622,7 +14622,7 @@ _080AC4A2:
strb r1, [r0]
movs r0, #0x8b
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _080AC50A
_080AC4BE:
ldrb r0, [r4, #0xf]
@@ -15301,7 +15301,7 @@ _080AC964:
strb r0, [r5, #0x15]
movs r0, #0x97
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_080AC9C0:
pop {r4, r5, pc}
.align 2, 0
@@ -15435,7 +15435,7 @@ _080ACAB0:
_080ACAB6:
strb r0, [r4, #0x15]
movs r0, #0xd8
bl PlaySFX
bl SoundReq
b _080ACAC4
_080ACAC0:
bl DeleteThisEntity
@@ -15457,7 +15457,7 @@ sub_080ACAC8: @ 0x080ACAC8
movs r1, #7
bl InitializeAnimation
ldr r0, _080ACAEC @ =0x00000199
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_080ACAE8: .4byte 0x0000FFFC
@@ -16361,7 +16361,7 @@ _080AD188:
bne _080AD196
movs r0, #0x82
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_080AD196:
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
@@ -16402,7 +16402,7 @@ _080AD1DA:
_080AD1E0:
movs r0, #0x82
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
ldrb r0, [r4, #0xe]
adds r0, #1
strb r0, [r4, #0xe]
@@ -16439,7 +16439,7 @@ _080AD220:
cmp r5, #0
beq _080AD244
movs r0, #0x79
bl PlaySFX
bl SoundReq
adds r0, r4, #0
bl sub_080AD27C
b _080AD26E
asm/code_080AD90C.s
+7 -7
View File
@@ -17,7 +17,7 @@ _080AD914: .4byte gUnk_03000000
thumb_func_start sub_080AD918
sub_080AD918: @ 0x080AD918
push {r4, lr}
ldr r1, _080AD948 @ =gUnk_03001000
ldr r1, _080AD948 @ =gMain
ldrb r0, [r1, #0xb]
adds r2, r0, #0
cmp r2, #0
@@ -40,7 +40,7 @@ sub_080AD918: @ 0x080AD918
adds r4, r1, #0
b _080AD95E
.align 2, 0
_080AD948: .4byte gUnk_03001000
_080AD948: .4byte gMain
_080AD94C: .4byte gUnk_03000000
_080AD950: .4byte 0x00000664
_080AD954: .4byte 0x000008EC
@@ -386,7 +386,7 @@ _080ADBE0:
cmp r5, #0
beq _080ADBF2
adds r0, r5, #0
bl PlaySFX
bl SoundReq
_080ADBF2:
movs r0, #0xf
strb r0, [r4, #0xf]
@@ -567,7 +567,7 @@ sub_080ADD30: @ 0x080ADD30
movs r1, #0x85
lsls r1, r1, #2
adds r0, r4, #0
bl _DmaZero
bl MemClear32
movs r5, #0
adds r4, #4
movs r0, #0x10
@@ -718,7 +718,7 @@ _080ADE54: .4byte gUnk_02024494
_080ADE58:
adds r0, r1, #0
movs r1, #0xc
bl _DmaZero
bl MemClear32
_080ADE60:
adds r5, #0xc
adds r4, #1
@@ -1084,7 +1084,7 @@ sub_080AE104: @ 0x080AE104
adds r1, r1, r5
lsls r1, r1, #2
adds r0, r4, #0
bl _DmaZero
bl MemClear32
strb r5, [r4, #1]
strh r6, [r4, #4]
adds r0, r4, #0
@@ -1396,7 +1396,7 @@ _080AE350:
stm r0!, {r2, r3, r7}
adds r0, r6, #0
movs r1, #0xc
bl _DmaZero
bl MemClear32
adds r6, #0xc
adds r5, #0xc
movs r0, #0xc
asm/createBowEntity.s
+1 -1
View File
@@ -147,7 +147,7 @@ _080190E8:
adds r0, r4, #0
bl InitializeAnimation
movs r0, #0xfc
bl PlaySFX
bl SoundReq
b _08019178
.align 2, 0
_080190F8: .4byte gUnk_080B3E40
asm/crenalBeanSprout.s
+3 -3
View File
@@ -483,7 +483,7 @@ _0809669C:
movs r0, #0xdc
bl sub_0807BA8C
movs r0, #0x79
bl PlaySFX
bl SoundReq
_080966F6:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -754,7 +754,7 @@ _080968C4:
bl sub_0807B7D8
_080968F0:
ldr r0, _08096900 @ =0x000001DB
bl PlaySFX
bl SoundReq
pop {r4, r5, r6, pc}
.align 2, 0
_080968F8: .4byte 0x000001CD
@@ -842,7 +842,7 @@ sub_08096988: @ 0x08096988
cmp r0, #0
bne _080969A2
movs r0, #0x72
bl PlaySFX
bl SoundReq
_080969A2:
pop {pc}
asm/cucco.s
+1 -1
View File
@@ -264,7 +264,7 @@ _0806E694:
bl sub_080791D0
_0806E698:
movs r0, #0xd5
bl PlaySFX
bl SoundReq
adds r1, r4, #0
adds r1, #0x39
movs r0, #0
asm/cuccoChick.s
+1 -1
View File
@@ -193,7 +193,7 @@ _0806E870:
bl sub_080791D0
_0806E874:
movs r0, #0xd6
bl PlaySFX
bl SoundReq
adds r1, r4, #0
adds r1, #0x39
movs r0, #0
asm/deathFx.s
+1 -1
View File
@@ -66,7 +66,7 @@ _08081674:
movs r1, #0
bl InitAnimationForceUpdate
ldr r0, _08081698 @ =0x00000129
bl PlaySFX
bl SoundReq
b _0808170C
.align 2, 0
_08081698: .4byte 0x00000129
asm/dog.s
+1 -1
View File
@@ -710,7 +710,7 @@ _0806A060:
adds r0, r4, #0
bl sub_0806A080
movs r0, #0xd1
bl PlaySFX
bl SoundReq
bl sub_080791D0
_0806A076:
adds r1, r4, #0
asm/drawHealth.s
+1 -1
View File
@@ -80,7 +80,7 @@ _0801C718:
cmp r1, #0
bne _0801C740
movs r0, #0x71
bl PlaySFX
bl SoundReq
_0801C740:
ldrb r0, [r7, #3]
adds r0, #1
asm/drawRupees.s
+1 -1
View File
@@ -127,7 +127,7 @@ _0801C58A:
cmp r0, #0
bne _0801C5A4
movs r0, #0x6f
bl PlaySFX
bl SoundReq
_0801C5A4:
ldr r4, _0801C5D4 @ =gUnk_0200AF00
ldrh r3, [r4, #0xe]
asm/dust.s
+4 -4
View File
@@ -139,14 +139,14 @@ _080441F2:
adds r0, r0, r1
adds r5, r0, #1
adds r0, r5, #0
bl sub_0801D8E0
bl zMalloc
adds r1, r0, #0
str r1, [r4, #0x64]
cmp r1, #0
beq _0804429A
adds r0, r6, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
adds r1, r4, #0
adds r1, #0x28
movs r0, #0xff
@@ -155,7 +155,7 @@ _080441F2:
ldrb r0, [r0]
lsls r0, r0, #3
adds r0, #0xc
bl sub_0801D8E0
bl zMalloc
adds r2, r0, #0
cmp r2, #0
bne _08044248
@@ -449,7 +449,7 @@ _08044440:
movs r0, #0x12
bl SetGlobalFlag
movs r0, #0x72
bl PlaySFX
bl SoundReq
bl DeleteThisEntity
_08044458:
movs r2, #0
asm/enemy5A.s
+2 -2
View File
@@ -82,11 +82,11 @@ _0804575C:
beq _0804576C
movs r0, #0xbd
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _080457D0
_0804576C:
ldr r0, _08045774 @ =0x00000119
bl PlaySFX
bl SoundReq
b _080457D0
.align 2, 0
_08045774: .4byte 0x00000119
asm/enemy5F.s
+3 -3
View File
@@ -55,7 +55,7 @@ _08048314:
bl InitializeAnimation
movs r0, #0xb3
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08048326:
adds r0, r4, #0
bl sub_080485D8
@@ -228,7 +228,7 @@ _08048456:
movs r1, #5
bl InitializeAnimation
ldr r0, _08048474 @ =0x0000019B
bl PlaySFX
bl SoundReq
_0804846A:
adds r0, r4, #0
bl sub_080485FC
@@ -386,7 +386,7 @@ _08048562:
bl sub_080485FC
movs r0, #0xb3
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0804859E:
pop {r4, pc}
asm/enemy62.s
+2 -2
View File
@@ -93,7 +93,7 @@ sub_08048E1C: @ 0x08048E1C
subs r0, r2, r0
strb r0, [r1]
ldr r0, _08048E44 @ =0x00000127
bl PlaySFX
bl SoundReq
b _08048E5C
.align 2, 0
_08048E44: .4byte 0x00000127
@@ -102,7 +102,7 @@ _08048E48:
strb r0, [r1]
movs r0, #0x94
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
movs r0, #0x28
movs r1, #0
bl sub_08080964
asm/enemy64.s
+5 -5
View File
@@ -877,7 +877,7 @@ sub_080496EC: @ 0x080496EC
adds r4, r0, #0
movs r0, #0x94
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
bl sub_08079F8C
cmp r0, #0
beq _08049720
@@ -975,7 +975,7 @@ sub_08049788: @ 0x08049788
strb r0, [r4, #0x15]
movs r0, #0x94
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _080497C6
_080497B8:
ldrb r0, [r4, #0x15]
@@ -1094,7 +1094,7 @@ sub_08049888: @ 0x08049888
movs r0, #0xa0
strb r0, [r1, #0xe]
movs r0, #0x72
bl PlaySFX
bl SoundReq
movs r0, #0x7c
bl SetFlag
movs r0, #1
@@ -1154,7 +1154,7 @@ _0804990E:
movs r2, #2
bl SetTile
movs r0, #0x71
bl PlaySFX
bl SoundReq
b _0804993E
.align 2, 0
_0804991C: .4byte 0x00004081
@@ -1170,7 +1170,7 @@ _08049920:
movs r2, #2
bl SetTile
movs r0, #0x71
bl PlaySFX
bl SoundReq
_0804993E:
pop {pc}
.align 2, 0
asm/ezloCap.s
-645
View File
@@ -1,645 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start EzloCap
EzloCap: @ 0x0806D86C
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #0
bne _0806D888
adds r0, #1
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #2
bl sub_0805E3A0
adds r0, r4, #0
bl sub_0807DD50
_0806D888:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
adds r0, r4, #0
bl sub_0807DDE4
adds r0, r4, #0
bl UpdateAnimationSingleFrame
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0806D8A0
sub_0806D8A0: @ 0x0806D8A0
push {r4, r5, lr}
adds r4, r0, #0
adds r3, r1, #0
movs r2, #0
movs r0, #8
strb r0, [r3, #0x19]
ldr r0, [r3, #8]
movs r1, #2
orrs r0, r1
str r0, [r3, #8]
str r2, [r3, #0x14]
movs r2, #0x10
ldrb r0, [r4, #0x18]
lsls r0, r0, #0x19
cmp r0, #0
bge _0806D8C2
rsbs r2, r2, #0
_0806D8C2:
ldr r1, _0806D900 @ =gPlayerEntity
movs r5, #0x2e
ldrsh r0, [r1, r5]
adds r2, r2, r0
movs r0, #0x32
ldrsh r1, [r1, r0]
adds r1, #2
strh r2, [r3, #0x1e]
strh r1, [r3, #0x22]
movs r3, #0x2e
ldrsh r0, [r4, r3]
subs r2, r2, r0
movs r5, #0x32
ldrsh r0, [r4, r5]
subs r1, r1, r0
adds r0, r2, #0
bl sub_080045DA
strb r0, [r4, #0x15]
ldrb r2, [r4, #0x14]
movs r1, #0x80
ands r1, r2
ldr r2, _0806D904 @ =gUnk_08114134
lsls r0, r0, #0x18
lsrs r0, r0, #0x1c
adds r0, r0, r2
ldrb r0, [r0]
orrs r1, r0
strb r1, [r4, #0x14]
pop {r4, r5, pc}
.align 2, 0
_0806D900: .4byte gPlayerEntity
_0806D904: .4byte gUnk_08114134
thumb_func_start sub_0806D908
sub_0806D908: @ 0x0806D908
push {r4, r5, lr}
adds r4, r0, #0
movs r1, #0x2e
ldrsh r0, [r4, r1]
movs r2, #0x32
ldrsh r1, [r4, r2]
ldr r3, _0806D93C @ =gPlayerEntity
movs r5, #0x2e
ldrsh r2, [r3, r5]
movs r5, #0x32
ldrsh r3, [r3, r5]
bl sub_080045D4
strb r0, [r4, #0x15]
ldrb r2, [r4, #0x14]
movs r1, #0x80
ands r1, r2
ldr r2, _0806D940 @ =gUnk_08114144
lsls r0, r0, #0x18
lsrs r0, r0, #0x19
adds r0, r0, r2
ldrb r0, [r0]
orrs r1, r0
strb r1, [r4, #0x14]
pop {r4, r5, pc}
.align 2, 0
_0806D93C: .4byte gPlayerEntity
_0806D940: .4byte gUnk_08114144
thumb_func_start sub_0806D944
sub_0806D944: @ 0x0806D944
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0x18]
movs r3, #0x41
rsbs r3, r3, #0
ands r3, r0
strb r3, [r2, #0x18]
ldr r0, _0806D968 @ =gPlayerEntity
ldr r1, [r2, #0x2c]
ldr r0, [r0, #0x2c]
cmp r1, r0
bgt _0806D964
movs r1, #0x40
adds r0, r3, #0
orrs r0, r1
strb r0, [r2, #0x18]
_0806D964:
pop {pc}
.align 2, 0
_0806D968: .4byte gPlayerEntity
thumb_func_start sub_0806D96C
sub_0806D96C: @ 0x0806D96C
push {r4, lr}
adds r4, r0, #0
movs r1, #0x42
movs r2, #0
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _0806D99C
adds r3, r2, #0
adds r3, #0x29
ldrb r1, [r3]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r3]
ldr r3, _0806D9A0 @ =0xFFE80000
adds r0, r4, #0
adds r1, r2, #0
movs r2, #0
bl PositionRelative
_0806D99C:
pop {r4, pc}
.align 2, 0
_0806D9A0: .4byte 0xFFE80000
thumb_func_start sub_0806D9A4
sub_0806D9A4: @ 0x0806D9A4
push {lr}
ldr r1, _0806D9BC @ =gPlayerEntity
ldr r2, [r0, #0x2c]
ldr r0, [r1, #0x2c]
adds r3, r1, #0
cmp r2, r0
bgt _0806D9C0
ldrb r1, [r3, #0x18]
movs r0, #0x41
rsbs r0, r0, #0
ands r0, r1
b _0806D9C6
.align 2, 0
_0806D9BC: .4byte gPlayerEntity
_0806D9C0:
ldrb r0, [r3, #0x18]
movs r1, #0x40
orrs r0, r1
_0806D9C6:
strb r0, [r3, #0x18]
movs r0, #4
strb r0, [r3, #0x14]
pop {pc}
.align 2, 0
thumb_func_start NPC4E
NPC4E: @ 0x0806D9D0
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
cmp r0, #0
bne _0806D9F8
movs r0, #1
strb r0, [r2, #0xc]
ldrb r1, [r2, #0x18]
subs r0, #5
ands r0, r1
strb r0, [r2, #0x18]
ldr r0, _0806D9F4 @ =gUnk_080FD170
str r0, [r2, #0x48]
adds r0, r2, #0
bl sub_0807DD50
b _0806DA00
.align 2, 0
_0806D9F4: .4byte gUnk_080FD170
_0806D9F8:
adds r0, r2, #0
movs r1, #0
bl sub_0807DD94
_0806DA00:
pop {pc}
.align 2, 0
thumb_func_start sub_0806DA04
sub_0806DA04: @ 0x0806DA04
push {lr}
ldr r3, [r1, #4]
lsls r3, r3, #3
ldr r1, _0806DA18 @ =gUnk_0811415C
adds r3, r3, r1
ldrb r2, [r3, #4]
movs r1, #1
bl sub_08078850
pop {pc}
.align 2, 0
_0806DA18: .4byte gUnk_0811415C
thumb_func_start sub_0806DA1C
sub_0806DA1C: @ 0x0806DA1C
push {lr}
ldr r3, _0806DA34 @ =gUnk_081141A4
ldr r2, [r1, #4]
lsls r0, r2, #2
adds r0, r0, r3
ldr r0, [r0]
ldr r1, _0806DA38 @ =gUnk_081141E4
adds r2, r2, r1
ldrb r1, [r2]
bl sub_0808091C
pop {pc}
.align 2, 0
_0806DA34: .4byte gUnk_081141A4
_0806DA38: .4byte gUnk_081141E4
thumb_func_start sub_0806DA3C
sub_0806DA3C: @ 0x0806DA3C
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xa]
subs r0, #1
cmp r0, #0xa
bhi _0806DA84
lsls r0, r0, #2
ldr r1, _0806DA54 @ =_0806DA58
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0806DA54: .4byte _0806DA58
_0806DA58: @ jump table
.4byte _0806DA88 @ case 0
.4byte _0806DA8C @ case 1
.4byte _0806DA90 @ case 2
.4byte _0806DA94 @ case 3
.4byte _0806DA98 @ case 4
.4byte _0806DAA0 @ case 5
.4byte _0806DAA0 @ case 6
.4byte _0806DAA0 @ case 7
.4byte _0806DAA0 @ case 8
.4byte _0806DAA0 @ case 9
.4byte _0806DA9C @ case 10
_0806DA84:
movs r0, #0
b _0806DAA6
_0806DA88:
movs r0, #1
b _0806DAA6
_0806DA8C:
movs r0, #2
b _0806DAA6
_0806DA90:
movs r0, #3
b _0806DAA6
_0806DA94:
movs r0, #4
b _0806DAA6
_0806DA98:
movs r0, #5
b _0806DAA6
_0806DA9C:
movs r0, #9
b _0806DAA6
_0806DAA0:
adds r0, r2, #0
bl sub_0801E99C
_0806DAA6:
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
pop {pc}
thumb_func_start sub_0806DAAC
sub_0806DAAC: @ 0x0806DAAC
push {r4, lr}
adds r4, r1, #0
bl sub_0806DA3C
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
bl CheckKinstoneFused
str r0, [r4, #0x14]
ldr r2, _0806DACC @ =gUnk_02033280
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
strb r0, [r2, #7]
pop {r4, pc}
.align 2, 0
_0806DACC: .4byte gUnk_02033280
thumb_func_start sub_0806DAD0
sub_0806DAD0: @ 0x0806DAD0
push {r4, lr}
adds r4, r0, #0
bl sub_0806DA3C
adds r1, r0, #0
lsls r1, r1, #0x18
lsrs r1, r1, #0x18
adds r0, r4, #0
bl sub_08078790
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0806DAE8
sub_0806DAE8: @ 0x0806DAE8
push {lr}
ldrb r0, [r0, #0xa]
subs r0, #1
cmp r0, #4
bhi _0806DB3A
lsls r0, r0, #2
ldr r1, _0806DAFC @ =_0806DB00
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0806DAFC: .4byte _0806DB00
_0806DB00: @ jump table
.4byte _0806DB14 @ case 0
.4byte _0806DB1C @ case 1
.4byte _0806DB24 @ case 2
.4byte _0806DB2C @ case 3
.4byte _0806DB34 @ case 4
_0806DB14:
movs r0, #0xee
bl SetLocalFlag
b _0806DB3A
_0806DB1C:
movs r0, #0xef
bl SetLocalFlag
b _0806DB3A
_0806DB24:
movs r0, #0xf0
bl SetLocalFlag
b _0806DB3A
_0806DB2C:
movs r0, #0xf1
bl SetLocalFlag
b _0806DB3A
_0806DB34:
movs r0, #0xf2
bl SetLocalFlag
_0806DB3A:
movs r0, #0xcd
bl PlaySFX
pop {pc}
.align 2, 0
thumb_func_start sub_0806DB44
sub_0806DB44: @ 0x0806DB44
push {r4, lr}
adds r4, r1, #0
movs r0, #0
str r0, [r4, #0x14]
movs r0, #0xee
bl CheckLocalFlag
cmp r0, #0
beq _0806DB82
movs r0, #0xef
bl CheckLocalFlag
cmp r0, #0
beq _0806DB82
movs r0, #0xf0
bl CheckLocalFlag
cmp r0, #0
beq _0806DB82
movs r0, #0xf1
bl CheckLocalFlag
cmp r0, #0
beq _0806DB82
movs r0, #0xf2
bl CheckLocalFlag
cmp r0, #0
beq _0806DB82
movs r0, #1
str r0, [r4, #0x14]
_0806DB82:
pop {r4, pc}
thumb_func_start sub_0806DB84
sub_0806DB84: @ 0x0806DB84
push {r4, r5, lr}
adds r5, r0, #0
ldr r0, _0806DBE4 @ =gUnk_08114154
str r0, [r5, #0x48]
movs r0, #0x3e
movs r1, #4
movs r2, #0
bl CreateObject
adds r4, r0, #0
cmp r4, #0
beq _0806DBB6
ldr r2, _0806DBE8 @ =0xFFF80000
adds r0, r5, #0
adds r1, r4, #0
movs r3, #0
bl PositionRelative
ldr r1, _0806DBEC @ =gUnk_08016030
adds r0, r4, #0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
_0806DBB6:
movs r0, #0x3e
movs r1, #5
movs r2, #0
bl CreateObject
adds r4, r0, #0
cmp r4, #0
beq _0806DBE2
movs r2, #0x80
lsls r2, r2, #0xc
adds r0, r5, #0
adds r1, r4, #0
movs r3, #0
bl PositionRelative
ldr r1, _0806DBF0 @ =gUnk_0801606C
adds r0, r4, #0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
_0806DBE2:
pop {r4, r5, pc}
.align 2, 0
_0806DBE4: .4byte gUnk_08114154
_0806DBE8: .4byte 0xFFF80000
_0806DBEC: .4byte gUnk_08016030
_0806DBF0: .4byte gUnk_0801606C
thumb_func_start sub_0806DBF4
sub_0806DBF4: @ 0x0806DBF4
push {r4, lr}
adds r4, r0, #0
cmp r4, #1
blo _0806DC36
cmp r4, #4
bls _0806DC04
cmp r4, #6
bne _0806DC36
_0806DC04:
movs r4, #1
movs r0, #2
bl GetInventoryValue
cmp r0, #0
beq _0806DC12
movs r4, #2
_0806DC12:
movs r0, #3
bl GetInventoryValue
cmp r0, #0
beq _0806DC1E
movs r4, #3
_0806DC1E:
movs r0, #4
bl GetInventoryValue
cmp r0, #0
beq _0806DC2A
movs r4, #4
_0806DC2A:
movs r0, #6
bl GetInventoryValue
cmp r0, #0
beq _0806DC36
movs r4, #6
_0806DC36:
adds r0, r4, #0
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0806DC3C
sub_0806DC3C: @ 0x0806DC3C
ldr r2, _0806DC54 @ =gSave
adds r1, r2, #0
adds r1, #0xb4
ldrb r3, [r1]
adds r1, r0, #0
adds r1, #0x68
strb r3, [r1]
adds r2, #0xb5
ldrb r1, [r2]
adds r0, #0x69
strb r1, [r0]
bx lr
.align 2, 0
_0806DC54: .4byte gSave
thumb_func_start sub_0806DC58
sub_0806DC58: @ 0x0806DC58
push {r4, lr}
adds r4, r0, #0
adds r0, #0x68
ldrb r0, [r0]
bl sub_0806DBF4
movs r1, #0
bl ForceEquipItem
adds r4, #0x69
ldrb r0, [r4]
bl sub_0806DBF4
movs r1, #1
bl ForceEquipItem
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0806DC7C
sub_0806DC7C: @ 0x0806DC7C
push {r4, lr}
ldr r4, _0806DC84 @ =gUnk_081141F4
b _0806DC94
.align 2, 0
_0806DC84: .4byte gUnk_081141F4
_0806DC88:
ldrh r1, [r4]
adds r4, #2
ldr r0, _0806DC9C @ =0x00004072
movs r2, #1
bl SetTileType
_0806DC94:
ldrh r0, [r4]
cmp r0, #0
bne _0806DC88
pop {r4, pc}
.align 2, 0
_0806DC9C: .4byte 0x00004072
thumb_func_start sub_0806DCA0
sub_0806DCA0: @ 0x0806DCA0
push {r4, lr}
ldr r4, _0806DCA8 @ =gUnk_081141F4
b _0806DCB6
.align 2, 0
_0806DCA8: .4byte gUnk_081141F4
_0806DCAC:
ldrh r0, [r4]
adds r4, #2
movs r1, #1
bl sub_0807BA8C
_0806DCB6:
ldrh r0, [r4]
cmp r0, #0
bne _0806DCAC
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0806DCC0
sub_0806DCC0: @ 0x0806DCC0
ldr r0, _0806DCD0 @ =gScreenTransition
movs r1, #0xf9
lsls r1, r1, #3
strh r1, [r0, #0x20]
movs r1, #0xf8
strh r1, [r0, #0x22]
bx lr
.align 2, 0
_0806DCD0: .4byte gScreenTransition
thumb_func_start NPC4E_Fusion
NPC4E_Fusion: @ 0x0806DCD4
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #0
bne _0806DD40
adds r0, #1
strb r0, [r4, #0xc]
ldrb r0, [r4, #0xa]
subs r0, #1
cmp r0, #0xa
bhi _0806DD40
lsls r0, r0, #2
ldr r1, _0806DCF4 @ =_0806DCF8
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0806DCF4: .4byte _0806DCF8
_0806DCF8: @ jump table
.4byte _0806DD24 @ case 0
.4byte _0806DD24 @ case 1
.4byte _0806DD24 @ case 2
.4byte _0806DD24 @ case 3
.4byte _0806DD24 @ case 4
.4byte _0806DD2C @ case 5
.4byte _0806DD2C @ case 6
.4byte _0806DD2C @ case 7
.4byte _0806DD2C @ case 8
.4byte _0806DD2C @ case 9
.4byte _0806DD34 @ case 10
_0806DD24:
adds r0, r4, #0
bl sub_0809623C
b _0806DD40
_0806DD2C:
adds r0, r4, #0
bl sub_08096260
b _0806DD40
_0806DD34:
adds r0, r4, #0
movs r1, #0
bl sub_0806DB84
movs r0, #0
str r0, [r4, #0x48]
_0806DD40:
pop {r4, pc}
.align 2, 0
asm/figurineDevice.s
+5 -5
View File
@@ -309,7 +309,7 @@ sub_08087DBC: @ 0x08087DBC
bl InitializeAnimation
movs r0, #0x88
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _08087E5A
.align 2, 0
_08087E0C: .4byte gUnk_08120AA8
@@ -404,7 +404,7 @@ _08087EB6:
cmp r1, #0
beq _08087ED8
movs r0, #0x6a
bl PlaySFX
bl SoundReq
movs r0, #2
strb r0, [r5]
movs r0, #0x3c
@@ -553,7 +553,7 @@ _08087FD6:
_08087FE0:
strb r0, [r1]
movs r0, #0x69
bl PlaySFX
bl SoundReq
b _08088032
_08087FEA:
adds r1, r5, #0
@@ -593,7 +593,7 @@ _08088028:
strb r3, [r7]
strb r2, [r1]
movs r0, #0x69
bl PlaySFX
bl SoundReq
_08088032:
pop {r4, r5, r6, r7, pc}
@@ -607,7 +607,7 @@ sub_08088034: @ 0x08088034
movs r0, #0x14
strb r0, [r1, #0xe]
movs r0, #0x6d
bl PlaySFX
bl SoundReq
_08088048:
pop {pc}
.align 2, 0
asm/fileScreen.s
+48 -48
View File
@@ -13,7 +13,7 @@ HandleGameplayScreen: @ 0x08051988
adds r0, #1
str r0, [r1]
ldr r1, _080519A8 @ =gUnk_080FC9D8
ldr r0, _080519AC @ =gUnk_03001000
ldr r0, _080519AC @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@@ -23,7 +23,7 @@ HandleGameplayScreen: @ 0x08051988
.align 2, 0
_080519A4: .4byte gScreenTransition
_080519A8: .4byte gUnk_080FC9D8
_080519AC: .4byte gUnk_03001000
_080519AC: .4byte gMain
thumb_func_start sub_080519B0
sub_080519B0: @ 0x080519B0
@@ -35,13 +35,13 @@ sub_080519B0: @ 0x080519B0
movs r0, #1
bl sub_0801DA90
bl sub_080A3210
bl sub_0801DA7C
bl zMallocInit
bl sub_080A7124
bl sub_0807059C
ldr r4, _08051A08 @ =gScreenTransition
adds r0, r4, #0
movs r1, #0xb0
bl _DmaZero
bl MemClear32
bl sub_08049CD4
bl sub_080300AC
bl sub_0807CA18
@@ -49,11 +49,11 @@ sub_080519B0: @ 0x080519B0
adds r1, r4, #0
adds r1, #0xc
movs r2, #0x20
bl _DmaCopy
bl MemCopy
movs r0, #4
strb r0, [r4, #9]
bl sub_08053518
ldr r1, _08051A10 @ =gUnk_03001000
ldr r1, _08051A10 @ =gMain
movs r0, #1
strb r0, [r1, #3]
strb r5, [r1, #4]
@@ -63,7 +63,7 @@ _08051A02:
_08051A04: .4byte gFadeControl
_08051A08: .4byte gScreenTransition
_08051A0C: .4byte gUnk_02002AC8
_08051A10: .4byte gUnk_03001000
_08051A10: .4byte gMain
thumb_func_start sub_08051A14
sub_08051A14: @ 0x08051A14
@@ -76,11 +76,11 @@ sub_08051A14: @ 0x08051A14
str r0, [r1, #4]
ldr r0, _08051A74 @ =gUnk_03000000
ldr r1, _08051A78 @ =0x00000B74
bl _DmaZero
bl MemClear32
ldr r0, _08051A7C @ =gUnk_02032EC0
movs r1, #0xed
lsls r1, r1, #2
bl _DmaZero
bl MemClear32
bl EraseAllEntities
bl sub_080197AC
bl sub_08080668
@@ -98,7 +98,7 @@ sub_08051A14: @ 0x08051A14
ldr r1, _08051A88 @ =gUnk_02024490
movs r0, #1
strb r0, [r1]
ldr r1, _08051A8C @ =gUnk_03001000
ldr r1, _08051A8C @ =gMain
movs r0, #2
strb r0, [r1, #3]
pop {pc}
@@ -110,13 +110,13 @@ _08051A7C: .4byte gUnk_02032EC0
_08051A80: .4byte gRoomControls
_08051A84: .4byte gScreenTransition
_08051A88: .4byte gUnk_02024490
_08051A8C: .4byte gUnk_03001000
_08051A8C: .4byte gMain
thumb_func_start sub_08051A90
sub_08051A90: @ 0x08051A90
push {lr}
ldr r1, _08051AA4 @ =gUnk_080FC9E8
ldr r0, _08051AA8 @ =gUnk_03001000
ldr r0, _08051AA8 @ =gMain
ldrb r0, [r0, #4]
lsls r0, r0, #2
adds r0, r0, r1
@@ -125,7 +125,7 @@ sub_08051A90: @ 0x08051A90
pop {pc}
.align 2, 0
_08051AA4: .4byte gUnk_080FC9E8
_08051AA8: .4byte gUnk_03001000
_08051AA8: .4byte gMain
thumb_func_start InitializeNewRoom
InitializeNewRoom: @ 0x08051AAC
@@ -136,14 +136,14 @@ InitializeNewRoom: @ 0x08051AAC
movs r0, #0xba
lsls r0, r0, #5
strh r0, [r1]
ldr r1, _08051AE8 @ =gUnk_03001000
ldr r1, _08051AE8 @ =gMain
movs r0, #1
strb r0, [r1, #4]
ldr r0, _08051AEC @ =gScreenTransition
strb r2, [r0, #8]
strb r2, [r0, #4]
strb r2, [r0, #5]
bl sub_08056418
bl MessageInitialize
bl sub_08052CFC
movs r0, #0
bl sub_0801C370
@@ -152,7 +152,7 @@ InitializeNewRoom: @ 0x08051AAC
pop {pc}
.align 2, 0
_08051AE4: .4byte gScreen
_08051AE8: .4byte gUnk_03001000
_08051AE8: .4byte gMain
_08051AEC: .4byte gScreenTransition
thumb_func_start sub_08051AF0
@@ -162,9 +162,9 @@ sub_08051AF0: @ 0x08051AF0
bl sub_0805BBBC
cmp r0, #0
bne _08051B02
bl sub_0807FC40
bl UpdateScroll
_08051B02:
bl sub_0801B060
bl UpdateBgAnim
bl sub_08000108
bl sub_0801C344
bl sub_0805E5F8
@@ -196,7 +196,7 @@ _08051B02:
ldr r0, _08051BC0 @ =0x800B0000
orrs r2, r0
adds r0, r2, #0
bl PlaySFX
bl SoundReq
_08051B5A:
bl sub_0805E9F4
bl sub_0805BC04
@@ -207,7 +207,7 @@ _08051B5A:
bl sub_0805E5B4
bl sub_08051E04
bl sub_080300C4
ldr r1, _08051BC4 @ =gUnk_03001000
ldr r1, _08051BC4 @ =gMain
movs r0, #2
strb r0, [r1, #4]
movs r0, #0
@@ -238,7 +238,7 @@ _08051BB4: .4byte gRoomControls
_08051BB8: .4byte gArea
_08051BBC: .4byte 0x00000864
_08051BC0: .4byte 0x800B0000
_08051BC4: .4byte gUnk_03001000
_08051BC4: .4byte gMain
_08051BC8: .4byte gUnk_02034490
_08051BCC: .4byte gRoomVars
@@ -252,7 +252,7 @@ sub_08051BD0: @ 0x08051BD0
cmp r0, #0
bne _08051C9C
bl sub_0805340C
ldr r0, _08051C5C @ =gUnk_03001000
ldr r0, _08051C5C @ =gMain
ldrb r0, [r0, #4]
cmp r0, #2
bne _08051C9C
@@ -272,9 +272,9 @@ _08051C06:
bl FlushSprites
bl sub_0805E5C0
bl sub_08080A40
bl sub_080175F4
bl sub_0807FC40
bl sub_0801B060
bl CollisionMain
bl UpdateScroll
bl UpdateBgAnim
bl sub_08000108
bl sub_08052C3C
bl sub_0801C344
@@ -295,7 +295,7 @@ _08051C06:
beq _08051C88
b _08051C9C
.align 2, 0
_08051C5C: .4byte gUnk_03001000
_08051C5C: .4byte gMain
_08051C60: .4byte gTextBox
_08051C64: .4byte gUnk_03003DC0
_08051C68: .4byte gRoomControls
@@ -303,19 +303,19 @@ _08051C6C:
ldr r0, _08051C80 @ =gPlayerState
movs r1, #0x17
strb r1, [r0, #0xc]
ldr r0, _08051C84 @ =gUnk_03001000
ldr r0, _08051C84 @ =gMain
strb r2, [r0, #4]
bl sub_0805E59C
bl sub_08051D98
b _08051C9C
.align 2, 0
_08051C80: .4byte gPlayerState
_08051C84: .4byte gUnk_03001000
_08051C84: .4byte gMain
_08051C88:
ldr r1, _08051CA0 @ =gPlayerState
movs r0, #0x17
strb r0, [r1, #0xc]
ldr r1, _08051CA4 @ =gUnk_03001000
ldr r1, _08051CA4 @ =gMain
movs r0, #1
strb r0, [r1, #4]
bl sub_0805E59C
@@ -324,7 +324,7 @@ _08051C9C:
pop {pc}
.align 2, 0
_08051CA0: .4byte gPlayerState
_08051CA4: .4byte gUnk_03001000
_08051CA4: .4byte gMain
thumb_func_start sub_08051CA8
sub_08051CA8: @ 0x08051CA8
@@ -333,7 +333,7 @@ sub_08051CA8: @ 0x08051CA8
cmp r0, #0
bne _08051CEA
bl sub_0805E5C0
bl sub_080175F4
bl CollisionMain
bl sub_0801C344
bl sub_0805E5F8
bl FlushSprites
@@ -359,7 +359,7 @@ sub_08051CF0: @ 0x08051CF0
bl FlushSprites
bl sub_0801C208
bl sub_080AD9B0
ldr r5, _08051D20 @ =gUnk_03001000
ldr r5, _08051D20 @ =gMain
movs r6, #1
strb r6, [r5, #0xb]
bl sub_080AD918
@@ -376,7 +376,7 @@ sub_08051CF0: @ 0x08051CF0
_08051D1E:
pop {r4, r5, r6, pc}
.align 2, 0
_08051D20: .4byte gUnk_03001000
_08051D20: .4byte gMain
_08051D24: .4byte gFadeControl
_08051D28: .4byte gScreenTransition
@@ -607,8 +607,8 @@ sub_08051F04: @ 0x08051F04
bl sub_0805E5C0
bl sub_080AD9B0
bl sub_080AD918
bl sub_0807FC40
bl sub_0801B060
bl UpdateScroll
bl UpdateBgAnim
bl sub_0805E5F8
bl sub_08000108
pop {pc}
@@ -641,7 +641,7 @@ _08051F68:
strb r0, [r2]
movs r0, #0x10
bl sub_080500F4
bl sub_08056418
bl MessageInitialize
_08051F76:
pop {pc}
@@ -727,17 +727,17 @@ _0805200C: .4byte gMenu
sub_08052010: @ 0x08052010
push {r4, lr}
bl sub_080A3210
bl sub_08056418
bl MessageInitialize
movs r0, #1
bl sub_0801DA90
ldr r0, _0805207C @ =gBG1Buffer
movs r4, #0x80
lsls r4, r4, #4
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _08052080 @ =gBG2Buffer
adds r1, r4, #0
bl _DmaZero
bl MemClear32
bl sub_080A4D34
movs r0, #0xa
bl LoadPaletteGroup
@@ -749,10 +749,10 @@ sub_08052010: @ 0x08052010
movs r0, #0xc0
lsls r0, r0, #0x13
movs r1, #0x20
bl _DmaZero
bl MemClear32
ldr r0, _08052084 @ =gMenu
movs r1, #0x30
bl _DmaZero
bl MemClear32
ldr r1, _08052088 @ =gScreen
ldrh r2, [r1]
movs r3, #0x80
@@ -780,7 +780,7 @@ _08052090: .4byte 0x00001D05
HandleGameOverScreen: @ 0x08052094
push {r4, lr}
ldr r1, _080520BC @ =gUnk_080FCA70
ldr r4, _080520C0 @ =gUnk_03001000
ldr r4, _080520C0 @ =gMain
ldrb r0, [r4, #3]
lsls r0, r0, #2
adds r0, r0, r1
@@ -796,18 +796,18 @@ _080520B8:
pop {r4, pc}
.align 2, 0
_080520BC: .4byte gUnk_080FCA70
_080520C0: .4byte gUnk_03001000
_080520C0: .4byte gMain
thumb_func_start sub_080520C4
sub_080520C4: @ 0x080520C4
push {lr}
ldr r1, _080520D4 @ =gUnk_03001000
ldr r1, _080520D4 @ =gMain
strb r0, [r1, #3]
movs r0, #0
bl sub_080A7114
pop {pc}
.align 2, 0
_080520D4: .4byte gUnk_03001000
_080520D4: .4byte gMain
thumb_func_start sub_080520D8
sub_080520D8: @ 0x080520D8
@@ -827,10 +827,10 @@ sub_080520D8: @ 0x080520D8
adds r0, #0xaa
movs r1, #0x18
strb r1, [r0]
ldr r0, _08052124 @ =gUnk_03001000
ldr r0, _08052124 @ =gMain
strb r2, [r0, #5]
movs r0, #0xa
bl PlaySFX
bl SoundReq
movs r0, #4
bl sub_080500F4
ldr r0, _08052128 @ =0xFFFF0001
@@ -843,6 +843,6 @@ _08052114:
_08052118: .4byte gFadeControl
_0805211C: .4byte gMenu
_08052120: .4byte gSave
_08052124: .4byte gUnk_03001000
_08052124: .4byte gMain
_08052128: .4byte 0xFFFF0001
asm/fourElements.s
+5 -5
View File
@@ -185,14 +185,14 @@ sub_080A02CC: @ 0x080A02CC
movs r1, #2
bl DoFade
movs r0, #0xf8
bl PlaySFX
bl SoundReq
movs r0, #0xa4
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
movs r0, #5
bl PlaySFX
bl SoundReq
ldr r0, _080A0348 @ =0x80110000
bl PlaySFX
bl SoundReq
_080A0342:
pop {r4, pc}
.align 2, 0
@@ -324,7 +324,7 @@ sub_080A0424: @ 0x080A0424
strb r0, [r1]
movs r0, #0xbc
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_080A0442:
pop {pc}
asm/gleerok.s
+16 -16
View File
@@ -62,7 +62,7 @@ _0802D04C:
ldr r0, _0802D08C @ =0x00001442
strh r0, [r1]
movs r0, #0xf6
bl PlaySFX
bl SoundReq
b _0802D148
.align 2, 0
_0802D088: .4byte gScreen
@@ -109,7 +109,7 @@ _0802D0D2:
cmp r0, #0
bne _0802D148
movs r0, #0xf7
bl PlaySFX
bl SoundReq
b _0802D148
.align 2, 0
_0802D0EC: .4byte gScreen
@@ -117,7 +117,7 @@ _0802D0F0: .4byte gPlayerEntity
_0802D0F4:
movs r0, #0x94
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
adds r0, r4, #0
bl sub_0804A7D4
b _0802D148
@@ -372,7 +372,7 @@ _0802D2E4:
bne _0802D2F8
movs r0, #0x94
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0802D2F8:
ldr r0, [r5]
movs r1, #0xf
@@ -542,7 +542,7 @@ _0802D420:
adds r0, r4, #0
bl sub_0802EB9C
movs r0, #0x54
bl sub_0801D8E0
bl zMalloc
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@@ -826,7 +826,7 @@ sub_0802D674: @ 0x0802D674
cmp r0, #0x96
bne _0802D692
ldr r0, _0802D6BC @ =0x00000127
bl PlaySFX
bl SoundReq
_0802D692:
ldr r0, [r4, #0x7c]
subs r1, r0, #1
@@ -841,7 +841,7 @@ _0802D692:
ldr r0, _0802D6C0 @ =gRoomControls
str r4, [r0, #0x30]
ldr r0, _0802D6BC @ =0x00000127
bl PlaySFX
bl SoundReq
b _0802D6EC
.align 2, 0
_0802D6B4: .4byte gUnk_02034490
@@ -1018,7 +1018,7 @@ sub_0802D7B4: @ 0x0802D7B4
ldr r0, _0802D80C @ =gUnk_02034490
strb r3, [r0]
movs r0, #0x2e
bl PlaySFX
bl SoundReq
b _0802D868
.align 2, 0
_0802D7FC: .4byte gUnk_080CD7F8
@@ -1036,7 +1036,7 @@ _0802D810:
adds r0, #2
strb r0, [r5, #0xf]
ldr r0, _0802D828 @ =0x00000127
bl PlaySFX
bl SoundReq
b _0802D830
.align 2, 0
_0802D828: .4byte 0x00000127
@@ -1225,7 +1225,7 @@ _0802D97A:
bls _0802D97A
movs r0, #0xa8
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0802D99C:
bl DeleteThisEntity
b _0802DB7E
@@ -1380,7 +1380,7 @@ _0802DA96:
strb r2, [r0]
movs r0, #0x86
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _0802DB20
.align 2, 0
_0802DAD4: .4byte gUnk_080CD884
@@ -2098,7 +2098,7 @@ _0802DFF8:
movs r0, #0x18
strb r0, [r1, #0xe]
ldr r0, _0802E030 @ =0x00000127
bl PlaySFX
bl SoundReq
_0802E026:
adds r0, r5, #0
bl sub_0802E518
@@ -2228,7 +2228,7 @@ _0802E0F4:
bl sub_08078B48
movs r0, #0x94
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _0802E1CA
.align 2, 0
_0802E128: .4byte gPlayerEntity
@@ -2296,7 +2296,7 @@ _0802E190:
cmp r0, #0
ble _0802E1B2
ldr r0, _0802E1CC @ =0x00000127
bl PlaySFX
bl SoundReq
_0802E1B2:
ldrh r0, [r5]
cmp r0, #0x77
@@ -2388,7 +2388,7 @@ _0802E23A:
bl CreateFx
movs r0, #0x92
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
cmp r4, #5
bne _0802E2F0
adds r0, r5, #0
@@ -2657,7 +2657,7 @@ _0802E452:
movs r2, #0
bl CreateFx
movs r0, #0x7d
bl PlaySFX
bl SoundReq
_0802E46E:
ldrb r0, [r4]
cmp r0, #0xa
asm/gyorgChild.s
+1 -1
View File
@@ -376,7 +376,7 @@ _080488E8:
bne _080488FA
movs r0, #0xcc
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_080488FA:
pop {r4, pc}
.align 2, 0
asm/gyorgFemale.s
+8 -8
View File
@@ -112,10 +112,10 @@ sub_0804614C: @ 0x0804614C
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _08046250 @ =gMapDataTopSpecial
adds r1, r4, #0
bl _DmaZero
bl MemClear32
adds r0, r6, #0
movs r1, #0
bl sub_0804660C
@@ -432,7 +432,7 @@ _0804646A:
strb r2, [r0]
movs r0, #0x94
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08046494:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -445,10 +445,10 @@ sub_08046498: @ 0x08046498
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl _DmaZero
bl MemClear32
ldr r0, _080464BC @ =gMapDataTopSpecial
adds r1, r4, #0
bl _DmaZero
bl MemClear32
adds r0, r5, #0
bl sub_080464C0
pop {r4, r5, pc}
@@ -475,7 +475,7 @@ _080464DE:
adds r0, r4, #0
adds r1, r5, #0
movs r2, #0x40
bl _DmaCopy
bl MemCopy
movs r0, #0x80
lsls r0, r0, #1
adds r5, r5, r0
@@ -486,7 +486,7 @@ _080464DE:
ldr r0, _0804650C @ =gUnk_02019EE0
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
bl MemClear32
ldr r1, _08046514 @ =gUnk_02000070
movs r0, #1
strb r0, [r1]
@@ -737,7 +737,7 @@ _080466D0:
movs r0, #0xff
strb r0, [r7]
adds r0, #0x28
bl PlaySFX
bl SoundReq
adds r5, r4, #0
adds r5, #0x45
ldrb r0, [r5]
asm/gyorgFemaleEye.s
+1 -1
View File
@@ -365,7 +365,7 @@ _08048C34:
adds r0, r4, #0
bl InitializeAnimation
ldr r0, _08048CB4 @ =0x00000119
bl PlaySFX
bl SoundReq
_08048C6C:
adds r0, r4, #0
bl GetNextFrame
asm/houseDoorInterior.s
+2 -2
View File
@@ -92,7 +92,7 @@ sub_08092BF8: @ 0x08092BF8
movs r0, #2
strb r0, [r4, #0xc]
ldr r0, _08092C1C @ =0x00000111
bl PlaySFX
bl SoundReq
b _08092C92
.align 2, 0
_08092C1C: .4byte 0x00000111
@@ -150,7 +150,7 @@ _08092C78:
movs r2, #0
bl sub_08078AC0
ldr r0, _08092C94 @ =0x00000111
bl PlaySFX
bl SoundReq
_08092C92:
pop {r4, r5, pc}
.align 2, 0
asm/intr.s
+11 -11
View File
@@ -255,7 +255,7 @@ sub_080B1C54: @ 0x080B1C54
ands r1, r1, #0x80
bxeq lr
ldr r2, _080B200C @ =gUnk_03000E10
ldr r3, _080B2010 @ =gUnk_03003DB8
ldr r3, _080B2010 @ =gHitboxCount
ldrb r1, [r3]
str r0, [r2, r1, lsl #2]
add r1, r1, #1
@@ -340,7 +340,7 @@ _080B1D84:
bx lr
_080B1D8C: .4byte gUnk_02018EA0
_080B1D90: .4byte gUnk_03000E10
_080B1D94: .4byte gUnk_03003DB8
_080B1D94: .4byte gHitboxCount
arm_func_start sub_080B1D98
sub_080B1D98: @ 0x080B1D98
@@ -525,7 +525,7 @@ _080B2000: .4byte gUnk_03005D24
_080B2004: .4byte gUnk_03005D18
_080B2008: .4byte gUnk_03005D58
_080B200C: .4byte gUnk_03000E10
_080B2010: .4byte gUnk_03003DB8
_080B2010: .4byte gHitboxCount
_080B2014: .4byte gUnk_080B7B74
_080B2018: .4byte gUnk_080B3744
@@ -649,8 +649,8 @@ _080B21A4: .4byte 0x01010101
_080B21A8: .4byte gUnk_02000006
_080B21AC: .4byte gUnk_08000F54
arm_func_start sub_080B21B0
sub_080B21B0: @ 0x080B21B0
arm_func_start UpdateEntities
UpdateEntities: @ 0x080B21B0
ldr fp, _080B2270 @ =gUnk_03003DD0
ldr r1, [fp]
ldm r1, {r7, r8, sb, sl}
@@ -695,14 +695,14 @@ _080B2238:
pop {r4, r5, r6, r7, r8, sb, sl, fp, lr}
bx lr
_080B2248: .4byte DeleteThisEntity
_080B224C: .4byte sub_08016F28
_080B224C: .4byte PlayerUpdate
_080B2250: .4byte DeleteThisEntity
_080B2254: .4byte sub_080011C4
_080B2258: .4byte sub_08016AE4
_080B2254: .4byte EnemyUpdate
_080B2258: .4byte ProjectileUpdate
_080B225C: .4byte DeleteThisEntity
_080B2260: .4byte sub_080174A4
_080B2264: .4byte sub_08017530
_080B2268: .4byte sub_08017338
_080B2260: .4byte ObjectUpdate
_080B2264: .4byte NPCUpdate
_080B2268: .4byte ItemUpdate
_080B226C: .4byte sub_08017508
_080B2270: .4byte gUnk_03003DD0
_080B2274: .4byte gUnk_080026A4
asm/item11.s
+1 -1
View File
@@ -188,7 +188,7 @@ sub_08018FA0: @ 0x08018FA0
_08018FBC:
ldrb r0, [r2, #0xa]
adds r0, #0xea
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_08018FC8: .4byte gPlayerEntity
asm/jarPortal.s
+1 -1
View File
@@ -285,7 +285,7 @@ _0808C082:
strb r0, [r4, #0xf]
movs r0, #0xa9
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0808C0A6:
pop {r4, r5, r6, pc}
.align 2, 0
asm/kid.s
+1 -1
View File
@@ -577,7 +577,7 @@ sub_08062500: @ 0x08062500
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0xa0
bl sub_0801D8E0
bl zMalloc
str r0, [r5, #0x64]
cmp r0, #0
beq _08062528
asm/ladderUp.s
+2 -2
View File
@@ -108,7 +108,7 @@ _0808DC0E:
movs r1, #0
bl sub_08080964
ldr r0, _0808DC28 @ =0x0000010B
bl PlaySFX
bl SoundReq
movs r0, #2
strb r0, [r7, #0xc]
movs r0, #0x3c
@@ -128,7 +128,7 @@ _0808DC3A:
movs r0, #3
strb r0, [r7, #0xc]
movs r0, #0x73
bl PlaySFX
bl SoundReq
b _0808DD72
_0808DC46:
ldrb r0, [r7, #0xb]
asm/librarians.s
+1 -1
View File
@@ -195,7 +195,7 @@ _0806BB52:
movs r1, #0xc
bl InitializeAnimation
movs r0, #0xcd
bl PlaySFX
bl SoundReq
b _0806BB78
_0806BB70:
adds r0, r4, #0
asm/lilypadLarge.s
+3 -3
View File
@@ -277,7 +277,7 @@ _080856EE:
beq _080856FC
strb r1, [r7, #0xf]
movs r0, #0x83
bl PlaySFX
bl SoundReq
_080856FC:
adds r2, r7, #0
adds r2, #0x41
@@ -833,7 +833,7 @@ _08085B22:
movs r3, #0
bl CreateObjectWithParent
ldr r0, _08085B3C @ =0x0000012D
bl PlaySFX
bl SoundReq
_08085B34:
pop {r4, pc}
.align 2, 0
@@ -1385,7 +1385,7 @@ sub_08085F48: @ 0x08085F48
strb r0, [r5, #0x12]
_08085F6A:
movs r0, #0x83
bl PlaySFX
bl SoundReq
ldr r1, [r4, #0x78]
ldr r0, _08085F84 @ =0x0127FFFF
cmp r1, r0
asm/lockedDoor.s
+1 -1
View File
@@ -470,7 +470,7 @@ sub_08083658: @ 0x08083658
movs r1, #0x3c
bl sub_0805E4E0
ldr r0, _0808369C @ =0x0000010B
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_08083698: .4byte gUnk_0811F680
asm/manager10.s
+6 -6
View File
@@ -101,7 +101,7 @@ sub_08059608: @ 0x08059608
adds r0, r0, r2
ldr r0, [r0]
str r0, [r1]
bl PlaySFX
bl SoundReq
b _08059682
.align 2, 0
_08059634: .4byte gArea
@@ -120,7 +120,7 @@ _08059638:
movs r0, #0x78
strb r0, [r4]
ldr r0, _08059664 @ =0x800D0000
bl PlaySFX
bl SoundReq
b _08059682
.align 2, 0
_0805965C: .4byte gArea
@@ -138,7 +138,7 @@ _08059668:
movs r0, #0x78
strb r0, [r4]
ldr r0, _0805968C @ =0x800D0000
bl PlaySFX
bl SoundReq
_08059682:
pop {r4, pc}
.align 2, 0
@@ -338,11 +338,11 @@ _08059800:
lsls r5, r5, #4
adds r0, r4, #0
adds r1, r5, #0
bl _DmaZero
bl MemClear32
ldr r1, _08059820 @ =0x0600E800
adds r0, r4, #0
adds r2, r5, #0
bl LoadAssetAsync
bl LoadResourceAsync
b _08059838
.align 2, 0
_0805981C: .4byte gBG3Buffer
@@ -440,7 +440,7 @@ _080598AA:
lsls r2, r2, #2
adds r1, r0, r2
movs r2, #0x20
bl _DmaCopy
bl MemCopy
ldr r2, _080598F0 @ =gUsedPalettes
ldr r0, [r2]
ldr r1, _080598F4 @ =0x00207FFC
asm/manager12.s
+3 -3
View File
@@ -245,7 +245,7 @@ _08059B94:
ldr r1, _08059BE8 @ =0x06001800
movs r2, #0x80
lsls r2, r2, #4
bl LoadAssetAsync
bl LoadResourceAsync
b _08059C5E
.align 2, 0
_08059BD8: .4byte 0x000004AB
@@ -384,12 +384,12 @@ _08059CEC:
movs r5, #0x80
lsls r5, r5, #5
adds r2, r5, #0
bl LoadAssetAsync
bl LoadResourceAsync
ldr r0, [r6, #8]
adds r0, r0, r4
ldr r1, [r6, #0xc]
adds r2, r5, #0
bl LoadAssetAsync
bl LoadResourceAsync
pop {r4, r5, r6, pc}
.align 2, 0
_08059D10: .4byte gUnk_08108468
asm/manager14.s
+2 -2
View File
@@ -465,7 +465,7 @@ sub_0805A1D8: @ 0x0805A1D8
ldrb r0, [r0]
cmp r0, #0
bne _0805A240
ldr r0, _0805A250 @ =gUnk_03001000
ldr r0, _0805A250 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x1f
ands r0, r1
@@ -492,7 +492,7 @@ _0805A240:
_0805A244: .4byte gRoomControls
_0805A248: .4byte 0xFFFFF000
_0805A24C: .4byte gScreen
_0805A250: .4byte gUnk_03001000
_0805A250: .4byte gMain
_0805A254: .4byte gUnk_0810859A
thumb_func_start nullsub_495
asm/manager22.s
+3 -3
View File
@@ -41,7 +41,7 @@ _0805B90A:
ldrb r0, [r5, #0xe]
bl sub_0801E154
_0805B934:
ldr r0, _0805B970 @ =gUnk_03001000
ldr r0, _0805B970 @ =gMain
ldrb r0, [r0, #4]
cmp r0, #2
bne _0805B952
@@ -68,7 +68,7 @@ _0805B952:
_0805B964: .4byte gArea
_0805B968: .4byte gScreen
_0805B96C: .4byte 0x0000D7FF
_0805B970: .4byte gUnk_03001000
_0805B970: .4byte gMain
_0805B974: .4byte 0x0000DFFF
_0805B978:
ldr r3, _0805B9A8 @ =gPlayerEntity
@@ -297,7 +297,7 @@ _0805BB28:
movs r2, #0x80
lsls r2, r2, #4
movs r0, #0xf
bl _DmaFill16
bl MemFill16
ldr r0, _0805BB58 @ =gScreen
ldr r1, _0805BB5C @ =0x00001E0C
strh r1, [r0, #0x2c]
asm/manager24.s
+1 -1
View File
@@ -89,7 +89,7 @@ sub_0805BFA4: @ 0x0805BFA4
cmp r0, #0
bne _0805BFC0
movs r0, #0x72
bl PlaySFX
bl SoundReq
adds r0, r4, #0
bl DeleteManager
_0805BFC0:
asm/manager2B.s
+1 -1
View File
@@ -117,7 +117,7 @@ _0805D0D8:
movs r0, #8
strb r0, [r4, #0xe]
movs r0, #0x72
bl PlaySFX
bl SoundReq
adds r0, r4, #0
bl sub_0805D11C
_0805D0F6:
asm/manager2C.s
+1 -1
View File
@@ -44,7 +44,7 @@ _0805D184:
ldr r4, _0805D1F8 @ =gUnk_030010AC
adds r0, r4, #0
movs r1, #0x20
bl _DmaZero
bl MemClear32
subs r4, #0xc
movs r1, #0
movs r0, #1
asm/manager2E.s
+3 -3
View File
@@ -78,13 +78,13 @@ sub_0805D2F4: @ 0x0805D2F4
ldrsh r0, [r4, r1]
cmp r0, #0
beq _0805D314
bl PlaySFX
bl SoundReq
b _0805D31A
.align 2, 0
_0805D310: .4byte gUnk_03003DC0
_0805D314:
movs r0, #0x72
bl PlaySFX
bl SoundReq
_0805D31A:
ldrh r0, [r4, #0x3c]
cmp r0, #0
@@ -166,7 +166,7 @@ sub_0805D384: @ 0x0805D384
adds r1, r0, #0
_0805D3A4:
adds r0, r1, #0
bl PlaySFX
bl SoundReq
ldrh r0, [r4, #0x3c]
bl SetFlag
b _0805D3C6
asm/manager33.s
+1 -1
View File
@@ -55,7 +55,7 @@ sub_0805DAE8: @ 0x0805DAE8
movs r0, #0x5a
strb r0, [r2, #0xe]
adds r0, #0xb0
bl PlaySFX
bl SoundReq
b _0805DB88
.align 2, 0
_0805DB4C: .4byte gRoomControls
asm/manager34.s
+2 -2
View File
@@ -116,7 +116,7 @@ _0805DC48:
bne _0805DC6C
movs r0, #0x93
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _0805DC6C
_0805DC58:
cmp r0, #0xc7
@@ -127,7 +127,7 @@ _0805DC58:
bne _0805DC6C
movs r0, #0x93
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0805DC6C:
pop {r4, pc}
.align 2, 0
asm/manager36.s
+1 -1
View File
@@ -28,7 +28,7 @@ _0805DDCE:
ldrh r0, [r3]
strb r0, [r2, #0xe]
ldrh r0, [r3, #2]
bl PlaySFX
bl SoundReq
b _0805DDE8
.align 2, 0
_0805DDE0: .4byte gUnk_08108DA8
asm/manager37.s
+3 -3
View File
@@ -138,7 +138,7 @@ _0805DF1A:
strb r0, [r2]
_0805DF3C:
movs r0, #0x32
bl PlaySFX
bl SoundReq
_0805DF42:
pop {r4, r5, pc}
.align 2, 0
@@ -211,7 +211,7 @@ _0805DFB8:
movs r1, #4
bl DoFade
movs r0, #0xf6
bl PlaySFX
bl SoundReq
_0805DFCA:
pop {pc}
@@ -288,7 +288,7 @@ _0805E040:
movs r1, #4
bl DoFade
movs r0, #0xf7
bl PlaySFX
bl SoundReq
_0805E062:
pop {r4, r5, r6, pc}
.align 2, 0
asm/managerF.s
+3 -3
View File
@@ -59,7 +59,7 @@ _08058EF2:
bl sub_08058F44
movs r0, #0x92
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
bl DeleteThisEntity
_08058F40:
pop {r4, r5, r6, pc}
@@ -348,7 +348,7 @@ sub_08059124: @ 0x08059124
ldrb r1, [r4, #0xb]
bl sub_0807BA8C
movs r0, #0xcd
bl PlaySFX
bl SoundReq
bl DeleteThisEntity
b _080591C8
_08059174:
@@ -540,7 +540,7 @@ _080592C8:
bl sub_0805930C
movs r0, #0xb7
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
bl DeleteThisEntity
_080592EA:
pop {r4, pc}
asm/mazaalBracelet.s
+15 -15
View File
@@ -104,7 +104,7 @@ _0803A1EA:
adds r0, #0x3d
strb r1, [r0]
ldr r0, _0803A20C @ =0x00000127
bl PlaySFX
bl SoundReq
b _0803A23E
.align 2, 0
_0803A20C: .4byte 0x00000127
@@ -128,7 +128,7 @@ _0803A210:
movs r1, #9
bl InitAnimationForceUpdate
ldr r0, _0803A248 @ =0x00000127
bl PlaySFX
bl SoundReq
_0803A23E:
ldr r1, _0803A24C @ =gUnk_080CFC14
adds r0, r4, #0
@@ -418,7 +418,7 @@ _0803A468:
bl InitAnimationForceUpdate
movs r0, #0xb7
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
b _0803A546
_0803A49A:
adds r0, r4, #0
@@ -699,7 +699,7 @@ _0803A6A8:
cmp r0, #0
beq _0803A6BE
ldr r0, _0803A6E0 @ =0x00000157
bl PlaySFX
bl SoundReq
_0803A6BE:
ldr r2, _0803A6E4 @ =gUnk_080CED6C
ldr r0, [r4, #0x50]
@@ -802,7 +802,7 @@ sub_0803A740: @ 0x0803A740
bl sub_08080964
movs r0, #0xac
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0803A77E:
pop {pc}
@@ -1013,7 +1013,7 @@ sub_0803A8B8: @ 0x0803A8B8
movs r1, #1
bl InitAnimationForceUpdate
ldr r0, _0803A908 @ =0x00000153
bl PlaySFX
bl SoundReq
pop {r4, pc}
.align 2, 0
_0803A904: .4byte gUnk_080CED6C
@@ -1266,7 +1266,7 @@ sub_0803AA98: @ 0x0803AA98
bl InitAnimationForceUpdate
movs r0, #0xb7
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0803AB0A:
pop {r4, pc}
.align 2, 0
@@ -1555,7 +1555,7 @@ _0803AD1A:
bl sub_08080964
movs r0, #0xac
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
adds r0, r4, #0
bl sub_0803B804
b _0803ADA4
@@ -1600,7 +1600,7 @@ _0803AD74:
bl sub_08080964
movs r0, #0xac
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
adds r0, r4, #0
bl sub_0803B804
b _0803ADAA
@@ -1941,7 +1941,7 @@ _0803AFF4:
bl sub_08080964
movs r0, #0xac
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_0803B018:
pop {pc}
.align 2, 0
@@ -2099,7 +2099,7 @@ _0803B11E:
movs r1, #9
bl InitAnimationForceUpdate
ldr r0, _0803B140 @ =0x0000014F
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_0803B13C: .4byte gUnk_080FD374
@@ -3123,7 +3123,7 @@ sub_0803B870: @ 0x0803B870
bl InitAnimationForceUpdate
movs r0, #0xb7
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
movs r0, #1
b _0803B8E6
.align 2, 0
@@ -3248,7 +3248,7 @@ _0803B9A8:
adds r0, #0x74
strb r1, [r0]
ldr r0, _0803BA10 @ =0x000001A9
bl PlaySFX
bl SoundReq
_0803B9C0:
ldrb r1, [r4, #0xf]
adds r0, r4, #0
@@ -3263,7 +3263,7 @@ _0803B9C0:
cmp r0, #0
bne _0803B9E0
ldr r0, _0803BA10 @ =0x000001A9
bl PlaySFX
bl SoundReq
_0803B9E0:
ldrb r0, [r5]
cmp r0, #0
@@ -3332,7 +3332,7 @@ _0803BA46:
cmp r0, #0
bne _0803BA66
ldr r0, _0803BA68 @ =0x000001A9
bl PlaySFX
bl SoundReq
_0803BA66:
pop {r4, r5, pc}
.align 2, 0
asm/mazaalHead.s
+4 -4
View File
@@ -315,7 +315,7 @@ _08034114:
strb r1, [r0]
bl sub_080791D0
movs r0, #0x2e
bl PlaySFX
bl SoundReq
_0803413E:
pop {r4, pc}
.align 2, 0
@@ -542,7 +542,7 @@ sub_080342C8: @ 0x080342C8
cmp r0, #0
bne _080342E4
ldr r0, _080342FC @ =0x00000115
bl PlaySFX
bl SoundReq
_080342E4:
ldr r2, _08034300 @ =gUnk_080CECEC
ldrb r0, [r4, #0xe]
@@ -585,7 +585,7 @@ _08034304:
movs r1, #0
bl sub_08080964
ldr r0, _08034344 @ =0x000001A1
bl PlaySFX
bl SoundReq
_08034340:
pop {r4, pc}
.align 2, 0
@@ -1667,7 +1667,7 @@ sub_08034AEC: @ 0x08034AEC
adds r1, #1
bl InitializeAnimation
ldr r0, _08034B08 @ =0x00000151
bl PlaySFX
bl SoundReq
pop {pc}
.align 2, 0
_08034B08: .4byte 0x00000151
asm/minecart.s
+1 -1
View File
@@ -248,7 +248,7 @@ _08091DA0:
strb r1, [r0, #6]
movs r0, #0x9e
lsls r0, r0, #1
bl PlaySFX
bl SoundReq
_08091DD8:
pop {r4, pc}
.align 2, 0
asm/minishEzlo.s
+1 -1
View File
@@ -152,7 +152,7 @@ sub_0806305C: @ 0x0806305C
movs r0, #0x10
strh r0, [r4]
ldr r0, _080630A0 @ =0x0000016F
bl PlaySFX
bl SoundReq
pop {r4, pc}
.align 2, 0
_080630A0: .4byte 0x0000016F
asm/mountainMinish.s
+1 -1
View File
@@ -287,7 +287,7 @@ _0806802C:
lsls r0, r0, #1
adds r0, r0, r4
ldrh r0, [r0]
bl PlaySFX
bl SoundReq
b _0806807E
.align 2, 0
_08068064: .4byte gUnk_0811137A
asm/non_matching/arm_proxy/sub_080173A4.inc → asm/non_matching/arm_proxy/ItemInit.inc
View File
asm/non_matching/arm_proxy/sub_08017530.inc
+1 -1
View File
@@ -77,7 +77,7 @@ _080175A4:
strh r0, [r2, #6]
_080175CC:
adds r0, r4, #0
bl sub_0800404C
bl DrawEntity
_080175D2:
pop {r4}
pop {r0}
asm/non_matching/arm_proxy/sub_08016DF8.inc → asm/non_matching/arm_proxy/sub_08017744.inc
View File
asm/non_matching/ezloCap/sub_0806D8A0.inc
+55
View File
@@ -0,0 +1,55 @@
.syntax unified
.text
push {r4, r5, lr}
adds r4, r0, #0
adds r3, r1, #0
movs r2, #0
movs r0, #8
strb r0, [r3, #0x19]
ldr r0, [r3, #8]
movs r1, #2
orrs r0, r1
str r0, [r3, #8]
str r2, [r3, #0x14]
movs r2, #0x10
ldrb r0, [r4, #0x18]
lsls r0, r0, #0x19
cmp r0, #0
bge _0806D8C2
rsbs r2, r2, #0
_0806D8C2:
ldr r1, _0806D900 @ =gPlayerEntity
movs r5, #0x2e
ldrsh r0, [r1, r5]
adds r2, r2, r0
movs r0, #0x32
ldrsh r1, [r1, r0]
adds r1, #2
strh r2, [r3, #0x1e]
strh r1, [r3, #0x22]
movs r3, #0x2e
ldrsh r0, [r4, r3]
subs r2, r2, r0
movs r5, #0x32
ldrsh r0, [r4, r5]
subs r1, r1, r0
adds r0, r2, #0
bl sub_080045DA
strb r0, [r4, #0x15]
ldrb r2, [r4, #0x14]
movs r1, #0x80
ands r1, r2
ldr r2, _0806D904 @ =gUnk_08114134
lsls r0, r0, #0x18
lsrs r0, r0, #0x1c
adds r0, r0, r2
ldrb r0, [r0]
orrs r1, r0
strb r1, [r4, #0x14]
pop {r4, r5, pc}
.align 2, 0
_0806D900: .4byte gPlayerEntity
_0806D904: .4byte gUnk_08114134
.syntax divided
asm/non_matching/ezloCap/sub_0806D908.inc
+32
View File
@@ -0,0 +1,32 @@
.syntax unified
.text
push {r4, r5, lr}
adds r4, r0, #0
movs r1, #0x2e
ldrsh r0, [r4, r1]
movs r2, #0x32
ldrsh r1, [r4, r2]
ldr r3, _0806D93C @ =gPlayerEntity
movs r5, #0x2e
ldrsh r2, [r3, r5]
movs r5, #0x32
ldrsh r3, [r3, r5]
bl sub_080045D4
strb r0, [r4, #0x15]
ldrb r2, [r4, #0x14]
movs r1, #0x80
ands r1, r2
ldr r2, _0806D940 @ =gUnk_08114144
lsls r0, r0, #0x18
lsrs r0, r0, #0x19
adds r0, r0, r2
ldrb r0, [r0]
orrs r1, r0
strb r1, [r4, #0x14]
pop {r4, r5, pc}
.align 2, 0
_0806D93C: .4byte gPlayerEntity
_0806D940: .4byte gUnk_08114144
.syntax divided
asm/non_matching/ezloCap/sub_0806DA04.inc
+15
View File
@@ -0,0 +1,15 @@
.syntax unified
.text
push {lr}
ldr r3, [r1, #4]
lsls r3, r3, #3
ldr r1, _0806DA18 @ =gUnk_0811415C
adds r3, r3, r1
ldrb r2, [r3, #4]
movs r1, #1
bl sub_08078850
pop {pc}
.align 2, 0
_0806DA18: .4byte gUnk_0811415C
.syntax divided
asm/non_matching/fileScreen/sub_08050EF4.inc
+4 -4
View File
@@ -95,7 +95,7 @@ _08050F9C:
movs r1, #0
bl CreateDialogBox
movs r0, #0x6a
bl PlaySFX
bl SoundReq
b _08050FBA
_08050FAC:
ldrb r0, [r6, #4]
@@ -103,7 +103,7 @@ _08050FAC:
ldrb r0, [r6, #5]
strb r0, [r1, #3]
movs r0, #0x6c
bl PlaySFX
bl SoundReq
_08050FBA:
adds r0, r5, #0
bl sub_080A7114
@@ -120,7 +120,7 @@ _08050FD0:
beq _08050FE2
strb r3, [r1, #1]
movs r0, #0x69
bl PlaySFX
bl SoundReq
b _08050FF4
_08050FE2:
cmp r2, r8
@@ -129,7 +129,7 @@ _08050FE2:
ldrb r0, [r6, #6]
bl LoadOptionsFromSave
movs r0, #0x69
bl PlaySFX
bl SoundReq
_08050FF4:
pop {r3}
mov r8, r3
asm/non_matching/fileScreen/sub_080610B8.inc
+2 -2
View File
@@ -80,7 +80,7 @@ _08051130:
cmp r5, #0
beq _0805114C
movs r0, #0x67
bl PlaySFX
bl SoundReq
_0805114C:
cmp r6, #0
beq _0805123A
@@ -339,7 +339,7 @@ _08051330:
strb r4, [r1, #1]
bl sub_08051458
movs r0, #0x68
bl PlaySFX
bl SoundReq
_0805134C:
pop {r4, r5, r6, r7, pc}
.align 2, 0

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