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

Merge branch 'huderlem-entities'

Browse Source
This commit is contained in:
theo3
2020-09-28 21:25:49 -07:00
parent 1bddf7c43d 3b78407194
commit f153a8da84
221 changed files with 48827 additions and 19392 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -56,6 +56,7 @@ src/*.s
tags
tools/agbcc
tools/binutils
translations/*.bin
types_*.taghl
*.zip
!calcrom.pl
INSTALL.md
+1 -1
View File
@@ -37,7 +37,7 @@ To set up the repository:
sh install.sh ../tmc
cd ../tmc
make tools
make setup
To build **tmc.gba**:
Makefile
+1
View File
@@ -161,6 +161,7 @@ include songs.mk
sound/%.bin: sound/%.aif ; $(AIF) $< $@
sound/songs/%.s: sound/songs/%.mid
cd $(@D) && ../../$(MID) $(<F)
translations/USA.bin: translations/USA.json ; tools/tmc_strings/tmc_strings -p --source $< --dest $@ --size 0x499E0
ifeq ($(NODEP),1)
$(C_BUILDDIR)/%.o: c_dep :=
asm/armos.s
+7 -7
View File
@@ -299,7 +299,7 @@ _080303C0:
bl sub_08030834
movs r0, #0x95
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
b _0803042C
.align 2, 0
_080303D0: .4byte gUnk_080FD2F0
@@ -450,7 +450,7 @@ _080304DE:
strb r2, [r3]
movs r0, #0x95
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_080304F0:
pop {r4, pc}
.align 2, 0
@@ -502,7 +502,7 @@ _0803053E:
strb r0, [r3]
movs r0, #0x95
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_08030552:
pop {pc}
@@ -597,7 +597,7 @@ _080305E4:
cmp r0, #0
bne _08030608
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
cmp r0, #0
bne _0803064A
ldrb r0, [r4, #0x15]
@@ -624,7 +624,7 @@ _0803061E:
cmp r3, #0
bne _08030638
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
cmp r0, #0
bne _0803064A
ldrb r0, [r4, #0x15]
@@ -1146,7 +1146,7 @@ _08030A02:
sub_08030A04: @ 0x08030A04
push {r4, lr}
adds r4, r0, #0
bl sub_080AEF88
bl ProcessMovement
adds r4, #0x5a
ldrb r1, [r4]
movs r0, #1
@@ -1157,7 +1157,7 @@ sub_08030A04: @ 0x08030A04
ands r0, r1
strb r0, [r4]
ldr r0, _08030A28 @ =0x00000101
bl sub_08004488
bl EnqueueSFX
_08030A24:
pop {r4, pc}
.align 2, 0
asm/ballChainSoldier.s
+2 -2
View File
@@ -161,7 +161,7 @@ sub_0803E61C: @ 0x0803E61C
cmp r0, #0
bne _0803E654
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
cmp r0, #0
bne _0803E654
adds r0, r4, #0
@@ -306,7 +306,7 @@ sub_0803E71C: @ 0x0803E71C
movs r0, #0xf6
strb r0, [r1]
adds r0, #0x65
bl sub_08004488
bl EnqueueSFX
_0803E756:
pop {pc}
.align 2, 0
asm/bigIceBlock.s
+1 -1
View File
@@ -98,7 +98,7 @@ sub_080997CC: @ 0x080997CC
strb r1, [r4, #0xc]
strb r0, [r4, #0xe]
ldr r0, _080997F0 @ =0x000001B3
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
bl sub_080997F4
_080997EC:
asm/bigPushableLever.s
+2 -2
View File
@@ -66,7 +66,7 @@ sub_08098F14: @ 0x08098F14
bl SetTile
movs r0, #0x99
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
adds r0, r5, #0
movs r1, #0x1e
bl sub_0805E4E0
@@ -348,7 +348,7 @@ _08099166:
cmp r0, #0
bne _08099194
ldr r0, _080991A0 @ =0x00000131
bl sub_08004488
bl EnqueueSFX
_08099194:
pop {r4, pc}
.align 2, 0
asm/bigVortex.s
-259
View File
@@ -1,259 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start BigVortex
BigVortex: @ 0x08098CF4
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xa]
cmp r0, #0
bne _08098D14
ldr r0, _08098D10 @ =gUnk_0812367C
ldrb r1, [r2, #0xc]
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r2, #0
bl _call_via_r1
b _08098D1A
.align 2, 0
_08098D10: .4byte gUnk_0812367C
_08098D14:
adds r0, r2, #0
bl sub_08098E3C
_08098D1A:
pop {pc}
thumb_func_start sub_08098D1C
sub_08098D1C: @ 0x08098D1C
push {r4, r5, lr}
adds r4, r0, #0
movs r5, #1
strb r5, [r4, #0xc]
ldr r0, _08098D40 @ =0x0000FFF0
strh r0, [r4, #0x36]
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
cmp r0, #0
beq _08098D44
bl CheckFlags
cmp r0, #0
bne _08098D44
strb r5, [r4, #0xc]
b _08098D5A
.align 2, 0
_08098D40: .4byte 0x0000FFF0
_08098D44:
movs r0, #3
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x18]
subs r0, #7
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
adds r0, r4, #0
bl sub_08098E88
_08098D5A:
adds r0, r4, #0
movs r1, #6
bl sub_0805E3A0
adds r0, r4, #0
movs r1, #0
bl InitAnimationForceUpdate
pop {r4, r5, pc}
thumb_func_start sub_08098D6C
sub_08098D6C: @ 0x08098D6C
push {r4, lr}
adds r4, r0, #0
adds r0, #0x86
ldrh r0, [r0]
bl CheckFlags
cmp r0, #0
beq _08098D9A
movs r0, #2
strb r0, [r4, #0xc]
movs r0, #0x2d
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #0x43
movs r2, #0
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08098D9A
ldrh r0, [r1, #0x32]
adds r0, #8
strh r0, [r1, #0x32]
_08098D9A:
pop {r4, pc}
thumb_func_start sub_08098D9C
sub_08098D9C: @ 0x08098D9C
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xe]
subs r0, #1
strb r0, [r2, #0xe]
lsls r0, r0, #0x18
cmp r0, #0
bne _08098DC2
movs r0, #3
strb r0, [r2, #0xc]
ldrb r1, [r2, #0x18]
subs r0, #7
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r2, #0x18]
adds r0, r2, #0
bl sub_08098E88
_08098DC2:
pop {pc}
thumb_func_start sub_08098DC4
sub_08098DC4: @ 0x08098DC4
push {r4, r5, r6, lr}
adds r5, r0, #0
ldr r6, _08098E2C @ =gPlayerEntity
adds r1, r6, #0
movs r2, #8
movs r3, #8
bl sub_0800419C
cmp r0, #0
beq _08098E24
adds r0, r5, #0
adds r1, r6, #0
bl CopyPosition
adds r0, r5, #0
bl sub_08004542
adds r0, r6, #0
bl sub_08004542
adds r0, r6, #0
adds r0, #0x38
movs r4, #1
strb r4, [r0]
adds r0, r5, #0
adds r1, r6, #0
bl ResolveEntityOnTop
ldr r1, _08098E30 @ =gPlayerState
movs r0, #0x1f
strb r0, [r1, #0xc]
adds r0, r1, #0
adds r0, #0x38
strb r4, [r0]
ldrb r0, [r5, #0xb]
adds r1, #0x39
strb r0, [r1]
movs r1, #4
strb r1, [r5, #0xc]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #1
bne _08098E20
movs r0, #0x23
bl SetGlobalFlag
_08098E20:
bl sub_08077B20
_08098E24:
adds r0, r5, #0
bl UpdateAnimationSingleFrame
pop {r4, r5, r6, pc}
.align 2, 0
_08098E2C: .4byte gPlayerEntity
_08098E30: .4byte gPlayerState
thumb_func_start sub_08098E34
sub_08098E34: @ 0x08098E34
push {lr}
bl UpdateAnimationSingleFrame
pop {pc}
thumb_func_start sub_08098E3C
sub_08098E3C: @ 0x08098E3C
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #0
bne _08098E5E
movs r2, #1
movs r0, #1
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x18]
subs r0, #5
ands r0, r1
orrs r0, r2
strb r0, [r4, #0x18]
ldrb r1, [r4, #0xa]
adds r0, r4, #0
bl InitAnimationForceUpdate
_08098E5E:
ldrb r1, [r4, #0xa]
movs r0, #2
ands r0, r1
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
lsls r0, r0, #1
ldr r1, _08098E84 @ =gUnk_08123690
adds r0, r0, r1
ldrh r1, [r0]
ldrh r2, [r0, #2]
adds r0, r4, #0
movs r3, #0
bl sub_0805EC9C
adds r0, r4, #0
bl UpdateAnimationSingleFrame
pop {r4, pc}
.align 2, 0
_08098E84: .4byte gUnk_08123690
thumb_func_start sub_08098E88
sub_08098E88: @ 0x08098E88
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0x82
movs r1, #1
movs r2, #0
bl CreateObject
adds r4, r0, #0
cmp r4, #0
beq _08098EB0
ldr r3, _08098ED8 @ =0xFFFF0000
adds r0, r5, #0
adds r1, r4, #0
movs r2, #0
bl PositionRelative
adds r1, r4, #0
adds r1, #0x63
movs r0, #8
strb r0, [r1]
_08098EB0:
movs r0, #0x82
movs r1, #2
movs r2, #0
bl CreateObject
adds r4, r0, #0
cmp r4, #0
beq _08098ED4
ldr r3, _08098EDC @ =0xFFFE0000
adds r0, r5, #0
adds r1, r4, #0
movs r2, #0
bl PositionRelative
adds r1, r4, #0
adds r1, #0x63
movs r0, #0x10
strb r0, [r1]
_08098ED4:
pop {r4, r5, pc}
.align 2, 0
_08098ED8: .4byte 0xFFFF0000
_08098EDC: .4byte 0xFFFE0000
asm/bird.s
-363
View File
@@ -6,369 +6,6 @@
.text
thumb_func_start Bird
Bird: @ 0x0809CF24
push {lr}
ldr r2, _0809CF38 @ =gUnk_08123EC0
ldrb r1, [r0, #0xa]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0809CF38: .4byte gUnk_08123EC0
thumb_func_start sub_0809CF3C
sub_0809CF3C: @ 0x0809CF3C
push {lr}
ldr r2, _0809CF50 @ =gUnk_08123EEC
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0809CF50: .4byte gUnk_08123EEC
thumb_func_start sub_0809CF54
sub_0809CF54: @ 0x0809CF54
push {r4, r5, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
movs r0, #0x31
strb r0, [r4, #0xe]
movs r0, #1
strb r0, [r4, #0xf]
ldr r0, _0809CFDC @ =0xFFFE8000
str r0, [r4, #0x20]
ldr r0, _0809CFE0 @ =0xFFC74000
str r0, [r4, #0x34]
adds r1, r4, #0
adds r1, #0x68
movs r0, #0xf8
lsls r0, r0, #8
strh r0, [r1]
movs r0, #0xa0
lsls r0, r0, #2
strh r0, [r4, #0x24]
movs r0, #8
strb r0, [r4, #0x15]
subs r1, #0x30
movs r0, #2
strb r0, [r1]
ldr r0, _0809CFE4 @ =gRoomControls
ldrh r0, [r0, #0xa]
strh r0, [r4, #0x2e]
ldr r0, _0809CFE8 @ =0x00000123
bl PlaySFX
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
adds r0, r4, #0
movs r1, #0
bl InitAnimationForceUpdate
movs r0, #0x95
movs r1, #1
movs r2, #0
bl CreateObject
adds r5, r0, #0
cmp r5, #0
beq _0809CFD8
str r4, [r5, #0x50]
movs r3, #0x80
lsls r3, r3, #0xc
adds r0, r4, #0
adds r1, r5, #0
movs r2, #0
bl PositionRelative
adds r0, r4, #0
adds r1, r5, #0
bl ResolveEntityOnTop
_0809CFD8:
pop {r4, r5, pc}
.align 2, 0
_0809CFDC: .4byte 0xFFFE8000
_0809CFE0: .4byte 0xFFC74000
_0809CFE4: .4byte gRoomControls
_0809CFE8: .4byte 0x00000123
thumb_func_start sub_0809CFEC
sub_0809CFEC: @ 0x0809CFEC
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
adds r0, r4, #0
adds r0, #0x68
movs r2, #0
ldrsh r1, [r0, r2]
adds r0, r4, #0
bl sub_08003FC4
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _0809D018
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #0
bne _0809D026
strb r0, [r4, #0xf]
b _0809D026
_0809D018:
adds r0, r4, #0
bl sub_080040A8
cmp r0, #0
bne _0809D026
bl DeleteThisEntity
_0809D026:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0809D030
sub_0809D030: @ 0x0809D030
push {lr}
ldr r2, _0809D044 @ =gUnk_08123EF4
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0809D044: .4byte gUnk_08123EF4
thumb_func_start sub_0809D048
sub_0809D048: @ 0x0809D048
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
adds r1, r4, #0
adds r1, #0x38
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
adds r0, r4, #0
movs r1, #0x17
bl InitAnimationForceUpdate
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0809D06C
sub_0809D06C: @ 0x0809D06C
push {lr}
ldr r2, _0809D080 @ =gUnk_08123EFC
ldrb r1, [r0, #0xd]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0809D080: .4byte gUnk_08123EFC
thumb_func_start sub_0809D084
sub_0809D084: @ 0x0809D084
push {lr}
adds r1, r0, #0
ldr r0, [r1, #0x50]
cmp r0, #0
beq _0809D0A8
ldrb r2, [r0, #0xf]
cmp r2, #0
beq _0809D0A0
movs r3, #0x80
lsls r3, r3, #0xc
movs r2, #0
bl PositionRelative
b _0809D0A8
_0809D0A0:
ldrb r0, [r1, #0xd]
adds r0, #1
strb r0, [r1, #0xd]
str r2, [r1, #0x20]
_0809D0A8:
pop {pc}
.align 2, 0
thumb_func_start sub_0809D0AC
sub_0809D0AC: @ 0x0809D0AC
push {r4, lr}
adds r4, r0, #0
movs r1, #0xc0
lsls r1, r1, #5
bl sub_080044EC
cmp r0, #1
bhi _0809D0F0
movs r2, #0
movs r0, #2
strb r0, [r4, #0xa]
movs r1, #1
strb r1, [r4, #0xc]
str r2, [r4, #0x34]
adds r0, r4, #0
adds r0, #0x38
strb r1, [r0]
movs r0, #0x45
bl SetLocalFlag
movs r0, #0x72
bl PlaySFX
adds r0, r4, #0
movs r1, #0x11
movs r2, #0
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _0809D0F0
adds r0, r4, #0
bl sub_0806FAD8
_0809D0F0:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0809D0F4
sub_0809D0F4: @ 0x0809D0F4
push {lr}
ldr r2, _0809D108 @ =gUnk_08123F04
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0809D108: .4byte gUnk_08123F04
thumb_func_start sub_0809D10C
sub_0809D10C: @ 0x0809D10C
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
adds r1, r4, #0
adds r1, #0x38
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
adds r0, r4, #0
movs r1, #0x17
bl InitAnimationForceUpdate
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0809D130
sub_0809D130: @ 0x0809D130
push {lr}
adds r2, r0, #0
ldr r0, _0809D148 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
cmp r0, #0
beq _0809D14C
adds r0, r2, #0
bl sub_0800445C
b _0809D170
.align 2, 0
_0809D148: .4byte gPlayerState
_0809D14C:
adds r0, r2, #0
bl sub_08017850
cmp r0, #0
beq _0809D170
movs r0, #0x17
movs r1, #0
movs r2, #0
bl CreateItemEntity
ldr r0, _0809D174 @ =gUnk_02002A40
ldr r1, [r0, #0x40]
movs r2, #0x80
lsls r2, r2, #0x15
orrs r1, r2
str r1, [r0, #0x40]
bl DeleteThisEntity
_0809D170:
pop {pc}
.align 2, 0
_0809D174: .4byte gUnk_02002A40
thumb_func_start sub_0809D178
sub_0809D178: @ 0x0809D178
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #0
bne _0809D19C
adds r0, #1
strb r0, [r4, #0xc]
adds r1, r4, #0
adds r1, #0x38
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
adds r1, r4, #0
adds r1, #0x5a
movs r0, #0x80
strb r0, [r1]
_0809D19C:
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _0809D1E8
bl Random
movs r1, #3
ands r1, r0
adds r0, r4, #0
bl InitializeAnimation
bl Random
movs r1, #0xf
ands r0, r1
adds r0, #0x10
adds r1, r4, #0
adds r1, #0x59
strb r0, [r1]
ldrb r1, [r4, #0x18]
movs r0, #0x41
rsbs r0, r0, #0
ands r0, r1
strb r0, [r4, #0x18]
bl Random
movs r1, #1
ands r1, r0
cmp r1, #0
beq _0809D1EE
ldrb r0, [r4, #0x18]
movs r1, #0x40
orrs r0, r1
strb r0, [r4, #0x18]
b _0809D1EE
_0809D1E8:
adds r0, r4, #0
bl GetNextFrame
_0809D1EE:
pop {r4, pc}
thumb_func_start sub_0809D1F0
sub_0809D1F0: @ 0x0809D1F0
push {r4, r5, r6, r7, lr}
asm/blockPushed.s
+1 -1
View File
@@ -233,7 +233,7 @@ _08082FF0:
bl sub_080832D8
_08083088:
ldr r0, _08083090 @ =0x0000010F
bl sub_08004488
bl EnqueueSFX
_0808308E:
pop {r4, r5, r6, pc}
.align 2, 0
asm/bobomb.s
+4 -4
View File
@@ -123,7 +123,7 @@ _0802C75E:
adds r0, r4, #0
bl sub_0802CB68
ldr r0, _0802C76C @ =0x0000014D
bl sub_08004488
bl EnqueueSFX
b _0802C79E
.align 2, 0
_0802C76C: .4byte 0x0000014D
@@ -375,7 +375,7 @@ sub_0802C91C: @ 0x0802C91C
adds r4, r0, #0
bl GetNextFrame
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
adds r0, r4, #0
adds r0, #0x82
ldrb r0, [r0]
@@ -638,7 +638,7 @@ _0802CB10:
bne _0802CB30
movs r0, #0x82
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_0802CB30:
adds r0, r4, #0
bl sub_0802CC18
@@ -777,7 +777,7 @@ sub_0802CC18: @ 0x0802CC18
movs r0, #0x1c
strb r0, [r1]
ldr r0, _0802CC38 @ =0x0000014D
bl sub_08004488
bl EnqueueSFX
_0802CC34:
pop {pc}
.align 2, 0
asm/bollard.s
+2 -2
View File
@@ -76,7 +76,7 @@ _0808B2F4:
ldrb r2, [r2]
bl SetTile
ldr r0, _0808B320 @ =0x000001A5
bl sub_08004488
bl EnqueueSFX
_0808B31C:
pop {r4, pc}
.align 2, 0
@@ -130,7 +130,7 @@ _0808B36C:
adds r0, r4, #0
bl sub_0808B3AC
ldr r0, _0808B388 @ =0x000001A5
bl sub_08004488
bl EnqueueSFX
_0808B384:
pop {r4, pc}
.align 2, 0
asm/book.s
+1 -1
View File
@@ -190,7 +190,7 @@ _0809B4C0:
lsls r0, r0, #2
strb r0, [r1, #0x15]
ldr r0, _0809B518 @ =0x0000010F
bl sub_08004488
bl EnqueueSFX
b _0809B520
.align 2, 0
_0809B510: .4byte gPlayerState
asm/bossDoor.s
+1 -1
View File
@@ -358,7 +358,7 @@ _0808C470:
strh r0, [r1, #0x32]
_0808C494:
ldr r0, _0808C4A0 @ =0x0000010B
bl sub_08004488
bl EnqueueSFX
_0808C49A:
pop {r4, r5, pc}
.align 2, 0
asm/bowMoblin.s
+1 -1
View File
@@ -675,7 +675,7 @@ sub_0803C6DC: @ 0x0803C6DC
strh r0, [r4, #0x24]
_0803C6EA:
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
adds r0, r4, #0
bl GetNextFrame
pop {r4, pc}
asm/businessScrub.s
+1 -1
View File
@@ -70,7 +70,7 @@ sub_08028934: @ 0x08028934
strh r0, [r1, #0x36]
_08028982:
ldr r0, _0802898C @ =0x000001BB
bl sub_08004488
bl EnqueueSFX
_08028988:
pop {r4, pc}
.align 2, 0
asm/businessScrubPrologue.s
+4 -4
View File
@@ -85,7 +85,7 @@ _08045C16:
movs r1, #0xff
strb r1, [r0]
ldr r0, _08045C34 @ =0x000001BB
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
movs r1, #2
bl sub_0805E3A0
@@ -480,7 +480,7 @@ _08045F00:
adds r0, r4, #0
bl sub_080954AC
ldr r0, _08045F34 @ =0x0000018D
bl sub_08004488
bl EnqueueSFX
b _08045F4E
.align 2, 0
_08045F34: .4byte 0x0000018D
@@ -698,7 +698,7 @@ _080460AE:
bge _0804608A
movs r0, #0xb7
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
ldr r0, _08046120 @ =0x000007A2
movs r1, #1
bl sub_0807BA8C
@@ -725,7 +725,7 @@ _080460AE:
bl CopyPosition
movs r0, #0xc2
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_08046102:
ldr r1, [r7, #0x54]
cmp r1, #0
asm/button.s
-745
View File
@@ -1,745 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Button
Button: @ 0x08081AC8
push {lr}
ldr r2, _08081ADC @ =gUnk_0811EE38
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_08081ADC: .4byte gUnk_0811EE38
thumb_func_start sub_08081AE0
sub_08081AE0: @ 0x08081AE0
push {r4, r5, r6, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x10]
movs r0, #0x7f
ands r0, r1
strb r0, [r4, #0x10]
ldrb r1, [r4, #0x11]
movs r0, #0x10
rsbs r0, r0, #0
ands r0, r1
movs r1, #3
orrs r0, r1
strb r0, [r4, #0x11]
ldrh r0, [r4, #0x32]
adds r0, #1
strh r0, [r4, #0x32]
adds r0, r4, #0
adds r0, #0x84
ldrh r1, [r0]
cmp r1, #0
beq _08081B0E
subs r0, #0x4c
strb r1, [r0]
_08081B0E:
movs r0, #0x2e
ldrsh r1, [r4, r0]
ldr r2, _08081B6C @ =gRoomControls
ldrh r0, [r2, #6]
subs r1, r1, r0
asrs r1, r1, #4
movs r3, #0x3f
ands r1, r3
movs r5, #0x32
ldrsh r0, [r4, r5]
ldrh r2, [r2, #8]
subs r0, r0, r2
asrs r0, r0, #4
ands r0, r3
lsls r0, r0, #6
orrs r1, r0
adds r5, r4, #0
adds r5, #0x74
strh r1, [r5]
ldrh r0, [r5]
adds r6, r4, #0
adds r6, #0x38
ldrb r1, [r6]
bl GetTileType
adds r1, r4, #0
adds r1, #0x72
strh r0, [r1]
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _08081B70
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl CheckFlags
cmp r0, #0
beq _08081B70
movs r0, #5
strb r0, [r4, #0xc]
ldrh r1, [r5]
ldrb r2, [r6]
movs r0, #0x7a
bl SetTileType
b _08081B82
.align 2, 0
_08081B6C: .4byte gRoomControls
_08081B70:
adds r0, r4, #0
bl sub_08081E3C
cmp r0, #0
beq _08081B7E
movs r0, #2
b _08081B80
_08081B7E:
movs r0, #1
_08081B80:
strb r0, [r4, #0xc]
_08081B82:
pop {r4, r5, r6, pc}
thumb_func_start sub_08081B84
sub_08081B84: @ 0x08081B84
push {r4, lr}
adds r4, r0, #0
bl sub_08081E3C
cmp r0, #0
beq _08081BAA
movs r0, #2
strb r0, [r4, #0xc]
adds r0, r4, #0
adds r0, #0x74
ldrh r0, [r0]
adds r1, r4, #0
adds r1, #0x38
ldrb r1, [r1]
bl GetTileType
adds r1, r4, #0
adds r1, #0x72
strh r0, [r1]
_08081BAA:
pop {r4, pc}
thumb_func_start sub_08081BAC
sub_08081BAC: @ 0x08081BAC
push {r4, lr}
adds r4, r0, #0
bl sub_08081CB0
cmp r0, #0
beq _08081BDC
movs r0, #0
strb r0, [r4, #0xd]
movs r0, #0xa
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #0xa
bl sub_0805E4E0
adds r0, r4, #0
bl sub_08081FF8
ldrb r0, [r4, #0xa]
cmp r0, #1
bne _08081BD8
movs r0, #3
b _08081BDA
_08081BD8:
movs r0, #5
_08081BDA:
strb r0, [r4, #0xc]
_08081BDC:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08081BE0
sub_08081BE0: @ 0x08081BE0
push {r4, lr}
adds r4, r0, #0
movs r1, #0x78
bl sub_08081F7C
cmp r0, #0
beq _08081C2C
adds r0, r4, #0
bl sub_08081D28
cmp r0, #0
bne _08081C26
movs r0, #4
strb r0, [r4, #0xc]
movs r0, #1
strb r0, [r4, #0xf]
ldr r1, _08081C1C @ =gPlayerState
ldrb r0, [r1, #5]
cmp r0, #2
beq _08081C16
adds r0, r1, #0
adds r0, #0x35
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
bne _08081C20
_08081C16:
movs r0, #0x18
strb r0, [r4, #0xe]
b _08081C2C
.align 2, 0
_08081C1C: .4byte gPlayerState
_08081C20:
movs r0, #8
strb r0, [r4, #0xe]
b _08081C2C
_08081C26:
adds r0, r4, #0
bl sub_08081E6C
_08081C2C:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08081C30
sub_08081C30: @ 0x08081C30
push {r4, r5, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _08081C70
subs r0, #1
movs r5, #0
strb r0, [r4, #0xe]
ldrb r0, [r4, #0xf]
cmp r0, #0
beq _08081C5A
strb r5, [r4, #0xf]
ldr r0, _08081C6C @ =0x00004035
adds r1, r4, #0
adds r1, #0x74
ldrh r1, [r1]
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl SetTile
_08081C5A:
adds r0, r4, #0
bl sub_08081CB0
cmp r0, #0
beq _08081C96
movs r0, #3
strb r0, [r4, #0xc]
strb r5, [r4, #0xe]
b _08081C96
.align 2, 0
_08081C6C: .4byte 0x00004035
_08081C70:
movs r0, #2
strb r0, [r4, #0xc]
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl ClearFlag
adds r0, r4, #0
adds r0, #0x74
ldrh r1, [r0]
subs r0, #0x3c
ldrb r2, [r0]
movs r0, #0x77
bl SetTileType
movs r0, #0x86
lsls r0, r0, #1
bl PlaySFX
_08081C96:
pop {r4, r5, pc}
thumb_func_start sub_08081C98
sub_08081C98: @ 0x08081C98
push {r4, lr}
adds r4, r0, #0
movs r1, #0x7a
bl sub_08081F7C
cmp r0, #0
beq _08081CAC
adds r0, r4, #0
bl sub_08081E6C
_08081CAC:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08081CB0
sub_08081CB0: @ 0x08081CB0
push {r4, r5, r6, lr}
adds r4, r0, #0
bl sub_08081D74
cmp r0, #0
beq _08081CEC
adds r1, r4, #0
adds r1, #0x70
ldr r0, _08081CE4 @ =0x0000FFFF
strh r0, [r1]
adds r5, r4, #0
adds r5, #0x74
ldrh r0, [r5]
adds r4, #0x38
ldrb r1, [r4]
bl GetTileType
ldr r1, _08081CE8 @ =0x00004035
cmp r0, r1
bne _08081D1C
ldrh r1, [r5]
ldrb r2, [r4]
movs r0, #0x78
bl sub_0807B7D8
b _08081D1C
.align 2, 0
_08081CE4: .4byte 0x0000FFFF
_08081CE8: .4byte 0x00004035
_08081CEC:
adds r6, r4, #0
adds r6, #0x74
ldrh r0, [r6]
adds r5, r4, #0
adds r5, #0x38
ldrb r1, [r5]
bl GetTileType
lsls r0, r0, #0x10
lsrs r1, r0, #0x10
cmp r1, #0x77
beq _08081D24
cmp r1, #0x79
beq _08081D24
ldr r0, _08081D20 @ =0x00004035
cmp r1, r0
beq _08081D24
ldrh r0, [r6]
ldrb r1, [r5]
bl sub_080001DA
adds r1, r4, #0
adds r1, #0x70
strh r0, [r1]
_08081D1C:
movs r0, #1
b _08081D26
.align 2, 0
_08081D20: .4byte 0x00004035
_08081D24:
movs r0, #0
_08081D26:
pop {r4, r5, r6, pc}
thumb_func_start sub_08081D28
sub_08081D28: @ 0x08081D28
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08081D74
cmp r0, #0
beq _08081D44
adds r1, r4, #0
adds r1, #0x70
ldr r0, _08081D40 @ =0x0000FFFF
strh r0, [r1]
movs r0, #1
b _08081D72
.align 2, 0
_08081D40: .4byte 0x0000FFFF
_08081D44:
adds r5, r4, #0
adds r5, #0x70
ldrh r1, [r5]
ldr r0, _08081D6C @ =0x0000FFFF
cmp r1, r0
beq _08081D70
adds r0, r4, #0
adds r0, #0x74
ldrh r0, [r0]
adds r1, r4, #0
adds r1, #0x38
ldrb r1, [r1]
bl sub_080001DA
ldrh r5, [r5]
cmp r0, r5
bne _08081D70
movs r0, #1
b _08081D72
.align 2, 0
_08081D6C: .4byte 0x0000FFFF
_08081D70:
movs r0, #0
_08081D72:
pop {r4, r5, pc}
thumb_func_start sub_08081D74
sub_08081D74: @ 0x08081D74
push {r4, r5, r6, lr}
adds r4, r0, #0
adds r0, #0x74
ldrh r0, [r0]
adds r1, r4, #0
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002E0
cmp r0, #0xf
bne _08081D8E
movs r0, #0
b _08081E0A
_08081D8E:
movs r6, #0
adds r0, r4, #0
bl sub_08081E0C
cmp r0, #0
beq _08081DB4
ldr r0, _08081DAC @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x90
ands r0, r1
cmp r0, #0
bne _08081E06
ldr r6, _08081DB0 @ =gPlayerEntity
b _08081E06
.align 2, 0
_08081DAC: .4byte gPlayerState
_08081DB0: .4byte gPlayerEntity
_08081DB4:
ldr r0, _08081DD8 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
lsls r1, r1, #0xf
ands r0, r1
cmp r0, #0
beq _08081E06
ldr r5, _08081DDC @ =gUnk_03004040
ldr r1, [r5]
adds r0, r4, #0
movs r2, #5
movs r3, #6
bl sub_080041A0
cmp r0, #0
beq _08081DE0
ldr r6, [r5]
b _08081E06
.align 2, 0
_08081DD8: .4byte gPlayerState
_08081DDC: .4byte gUnk_03004040
_08081DE0:
ldr r1, [r5, #4]
adds r0, r4, #0
movs r2, #5
movs r3, #6
bl sub_080041A0
cmp r0, #0
beq _08081DF4
ldr r6, [r5, #4]
b _08081E06
_08081DF4:
ldr r1, [r5, #8]
adds r0, r4, #0
movs r2, #5
movs r3, #6
bl sub_080041A0
cmp r0, #0
beq _08081E06
ldr r6, [r5, #8]
_08081E06:
str r6, [r4, #0x54]
adds r0, r6, #0
_08081E0A:
pop {r4, r5, r6, pc}
thumb_func_start sub_08081E0C
sub_08081E0C: @ 0x08081E0C
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _08081E28 @ =gPlayerEntity
movs r1, #0x36
ldrsh r0, [r5, r1]
cmp r0, #0
bne _08081E22
bl sub_08079F8C
cmp r0, #0
bne _08081E2C
_08081E22:
movs r0, #0
b _08081E38
.align 2, 0
_08081E28: .4byte gPlayerEntity
_08081E2C:
adds r0, r4, #0
adds r1, r5, #0
movs r2, #5
movs r3, #6
bl sub_080041A0
_08081E38:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_08081E3C
sub_08081E3C: @ 0x08081E3C
push {lr}
adds r1, r0, #0
adds r1, #0x74
ldrh r2, [r1]
adds r0, #0x38
ldrb r1, [r0]
adds r0, r2, #0
bl GetTileType
adds r2, r0, #0
ldr r1, _08081E64 @ =gUnk_0811EE50
_08081E52:
ldrh r0, [r1]
cmp r0, r2
beq _08081E68
adds r1, #2
ldrh r0, [r1]
cmp r0, #0
bne _08081E52
movs r0, #0
b _08081E6A
.align 2, 0
_08081E64: .4byte gUnk_0811EE50
_08081E68:
movs r0, #1
_08081E6A:
pop {pc}
thumb_func_start sub_08081E6C
sub_08081E6C: @ 0x08081E6C
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
adds r0, #0x74
ldrh r6, [r0]
subs r0, #0x3c
ldrb r5, [r0]
adds r0, r6, #0
adds r1, r5, #0
bl GetTileType
adds r7, r0, #0
ldr r0, _08081EEC @ =0x00003FFF
cmp r7, r0
bls _08081EE8
adds r0, r5, #0
bl GetLayerByIndex
adds r1, r0, #0
ldrb r0, [r4, #0xa]
movs r4, #0x78
cmp r0, #0
bne _08081E9A
movs r4, #0x7a
_08081E9A:
ldr r0, _08081EF0 @ =0x00007004
adds r3, r1, r0
lsls r0, r4, #1
ldr r2, _08081EF4 @ =0x00006004
adds r1, r1, r2
adds r1, r1, r0
ldrh r0, [r1]
lsls r0, r0, #3
adds r3, r3, r0
ldr r2, _08081EF8 @ =gUnk_02019EE0
cmp r5, #2
bne _08081EB4
ldr r2, _08081EFC @ =gMapDataTopSpecial
_08081EB4:
movs r0, #0x3f
ands r0, r6
lsls r0, r0, #1
movs r1, #0xfc
lsls r1, r1, #4
ands r1, r6
lsls r1, r1, #2
adds r0, r0, r1
lsls r0, r0, #1
adds r2, r2, r0
adds r0, r2, #0
adds r1, r3, #0
bl sub_08081F00
cmp r0, #0
bne _08081EE8
adds r0, r4, #0
adds r1, r6, #0
adds r2, r5, #0
bl SetTileType
adds r0, r7, #0
adds r1, r6, #0
adds r2, r5, #0
bl SetTile
_08081EE8:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08081EEC: .4byte 0x00003FFF
_08081EF0: .4byte 0x00007004
_08081EF4: .4byte 0x00006004
_08081EF8: .4byte gUnk_02019EE0
_08081EFC: .4byte gMapDataTopSpecial
thumb_func_start sub_08081F00
sub_08081F00: @ 0x08081F00
push {lr}
adds r2, r0, #0
adds r3, r1, #0
ldr r1, [r2]
ldr r0, [r3]
cmp r1, r0
bne _08081F20
movs r1, #0x80
lsls r1, r1, #1
adds r0, r2, r1
ldr r1, [r0]
ldr r0, [r3, #4]
cmp r1, r0
bne _08081F20
movs r0, #1
b _08081F22
_08081F20:
movs r0, #0
_08081F22:
pop {pc}
thumb_func_start sub_08081F24
sub_08081F24: @ 0x08081F24
push {r4, lr}
adds r4, r0, #0
movs r1, #0x11
movs r2, #0x40
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _08081F50
ldrb r1, [r2, #0x11]
movs r0, #0x10
rsbs r0, r0, #0
ands r0, r1
movs r1, #3
orrs r0, r1
strb r0, [r2, #0x11]
ldrh r0, [r2, #0x2e]
adds r0, #7
strh r0, [r2, #0x2e]
ldrh r0, [r2, #0x32]
adds r0, #5
strh r0, [r2, #0x32]
_08081F50:
adds r0, r4, #0
movs r1, #0x11
movs r2, #0x40
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _08081F7A
ldrb r1, [r2, #0x11]
movs r0, #0x10
rsbs r0, r0, #0
ands r0, r1
movs r1, #3
orrs r0, r1
strb r0, [r2, #0x11]
ldrh r0, [r2, #0x2e]
subs r0, #7
strh r0, [r2, #0x2e]
ldrh r0, [r2, #0x32]
adds r0, #5
strh r0, [r2, #0x32]
_08081F7A:
pop {r4, pc}
thumb_func_start sub_08081F7C
sub_08081F7C: @ 0x08081F7C
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
adds r7, r1, #0
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _08081FF4
subs r1, r0, #1
strb r1, [r4, #0xe]
lsls r0, r1, #0x18
lsrs r0, r0, #0x18
cmp r0, #6
bls _08081FA4
ldr r0, [r4, #0x54]
cmp r0, #0
beq _08081FF4
adds r1, r0, #0
adds r1, #0x63
movs r0, #0xfc
strb r0, [r1]
b _08081FF4
_08081FA4:
lsls r0, r1, #0x18
lsrs r0, r0, #0x18
cmp r0, #6
bne _08081FF4
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl SetFlag
adds r6, r4, #0
adds r6, #0x74
ldrh r1, [r6]
adds r5, r4, #0
adds r5, #0x38
ldrb r2, [r5]
adds r0, r7, #0
bl SetTileType
adds r0, r4, #0
bl sub_08081F24
movs r0, #0x86
lsls r0, r0, #1
bl PlaySFX
adds r2, r4, #0
adds r2, #0x70
ldrh r1, [r2]
ldr r0, _08081FF0 @ =0x0000FFFF
cmp r1, r0
beq _08081FEC
adds r0, r1, #0
ldrh r1, [r6]
ldrb r2, [r5]
bl SetTile
_08081FEC:
movs r0, #0
b _08081FF6
.align 2, 0
_08081FF0: .4byte 0x0000FFFF
_08081FF4:
movs r0, #1
_08081FF6:
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_08081FF8
sub_08081FF8: @ 0x08081FF8
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r1, [r4, #0x54]
ldr r0, _08082038 @ =gPlayerEntity
cmp r1, r0
bne _08082036
adds r0, r1, #0
adds r1, r4, #0
bl GetFacingDirection
adds r6, r0, #0
ldr r0, [r4, #0x54]
movs r1, #0x80
lsls r1, r1, #2
adds r2, r6, #0
bl sub_080044AE
movs r5, #0
ldr r4, _0808203C @ =gUnk_03004040
_0808201E:
ldr r0, [r4]
cmp r0, #0
beq _0808202E
movs r1, #0x80
lsls r1, r1, #2
adds r2, r6, #0
bl sub_080044AE
_0808202E:
adds r4, #4
adds r5, #1
cmp r5, #2
bls _0808201E
_08082036:
pop {r4, r5, r6, pc}
.align 2, 0
_08082038: .4byte gPlayerEntity
_0808203C: .4byte gUnk_03004040
asm/castleMaid.s
+1 -1
View File
@@ -288,7 +288,7 @@ _08064710:
orrs r0, r1
str r0, [r5, #8]
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
movs r0, #0x2e
ldrsh r1, [r4, r0]
adds r2, r4, #0
asm/castorWildsStatue.s
+1 -1
View File
@@ -260,7 +260,7 @@ _08067560:
ble _0806753A
movs r0, #0xa6
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
movs r0, #0x28
movs r1, #4
bl sub_08080964
asm/chuchuBoss.s
+4 -4
View File
@@ -1407,7 +1407,7 @@ _0802670A:
bl PlaySFX
_08026726:
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
_0802672C:
adds r0, r4, #0
adds r0, #0x76
@@ -1589,7 +1589,7 @@ sub_0802686C: @ 0x0802686C
cmp r5, #0
beq _08026888
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
b _080268BE
_08026888:
movs r0, #0x10
@@ -2687,7 +2687,7 @@ _080270D4:
ldrb r0, [r0, #0xc]
strb r0, [r5, #0x15]
adds r0, r5, #0
bl sub_080AEF88
bl ProcessMovement
_080270E0:
adds r0, r6, #0
adds r0, #0x85
@@ -2747,7 +2747,7 @@ _08027110:
b _080271FE
_0802714A:
adds r0, r5, #0
bl sub_080AEF88
bl ProcessMovement
b _080271FE
_08027152:
adds r0, r6, #0
asm/cloudPiranha.s
+3 -3
View File
@@ -376,7 +376,7 @@ sub_080386B8: @ 0x080386B8
strb r0, [r2]
movs r0, #0x92
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
movs r1, #0x70
bl sub_0801D2B4
@@ -459,7 +459,7 @@ sub_08038754: @ 0x08038754
orrs r0, r1
strb r0, [r2]
ldr r0, _080387C0 @ =0x0000012B
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
movs r1, #0x71
bl sub_0801D2B4
@@ -593,7 +593,7 @@ _08038890:
cmp r0, #0
bne _080388A8
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
b _080388B2
_080388A8:
subs r0, #1
asm/code_080043E8.s
+2 -2
View File
@@ -85,8 +85,8 @@ sub_08004484: @ 0x08004484
ldr r2, _080044DC @ =gUnk_03005FF0
bx r2
thumb_func_start sub_08004488
sub_08004488: @ 0x08004488
thumb_func_start EnqueueSFX
EnqueueSFX: @ 0x08004488
ldr r1, _080044E0 @ =gUnk_02024048
ldrb r2, [r1]
cmp r2, #8
asm/code_0800857C.s
+1 -1
View File
@@ -769,7 +769,7 @@ sub_08008B22: @ 0x08008B22
sub_08008B2E: @ 0x08008B2E
push {r0, lr}
adds r0, r2, #0
bl sub_08004488
bl EnqueueSFX
pop {r0, pc}
.align 2, 0
_08008B38: .4byte 0x00000180
asm/code_08016DF8.s
+1 -1
View File
@@ -398,7 +398,7 @@ _080170E8:
cmp r0, #0
bne _08017112
ldr r0, _08017138 @ =0x0000011F
bl sub_08004488
bl EnqueueSFX
_08017112:
ldr r0, _0801712C @ =gUnk_02002A40
adds r2, r0, #0
asm/code_08019444.s
+1 -1
View File
@@ -4328,7 +4328,7 @@ _0801B4AC:
cmp r0, #0
bne _0801B4C0
movs r0, #0xfb
bl sub_08004488
bl EnqueueSFX
_0801B4C0:
pop {r4, pc}
.align 2, 0
asm/code_08049CD4.s
+2 -2
View File
@@ -364,8 +364,8 @@ _08049F60:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_08049F64
sub_08049F64: @ 0x08049F64
thumb_func_start PlayerInRange
PlayerInRange: @ 0x08049F64
push {r4, r5, lr}
adds r4, r0, #0
adds r0, r1, #0
asm/code_080526F8.s
+2 -2
View File
@@ -960,7 +960,7 @@ sub_08052E10: @ 0x08052E10
adds r0, r3, r0
ldr r0, [r0]
str r0, [r5, #0x18]
ldr r0, _08052E88 @ =gUnk_080D50FC
ldr r0, _08052E88 @ =gAreaEntities
adds r2, r2, r0
ldr r0, [r2]
cmp r0, #0
@@ -976,7 +976,7 @@ _08052E78: .4byte gAreaRoomMaps
_08052E7C: .4byte gAreaMetatiles
_08052E80: .4byte gUnk_080B755C
_08052E84: .4byte gUnk_0813A7F0
_08052E88: .4byte gUnk_080D50FC
_08052E88: .4byte gAreaEntities
thumb_func_start sub_08052E8C
sub_08052E8C: @ 0x08052E8C
asm/code_0808091C.s
Executable
+436
View File
@@ -0,0 +1,436 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08080A40
sub_08080A40: @ 0x08080A40
push {r4, r5, r6, r7, lr}
ldr r7, _08080A70 @ =gRoomControls
ldr r1, [r7, #0x30]
ldr r0, _08080A74 @ =gPlayerEntity
adds r2, r7, #0
cmp r1, r0
beq _08080A50
b _08080B5C
_08080A50:
ldr r0, _08080A78 @ =gPlayerState
ldrb r0, [r0, #2]
cmp r0, #0
beq _08080A5A
b _08080B5C
_08080A5A:
ldrb r0, [r1, #0xc]
subs r0, #1
cmp r0, #0x1c
bls _08080A64
b _08080B5C
_08080A64:
lsls r0, r0, #2
ldr r1, _08080A7C @ =_08080A80
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08080A70: .4byte gRoomControls
_08080A74: .4byte gPlayerEntity
_08080A78: .4byte gPlayerState
_08080A7C: .4byte _08080A80
_08080A80: @ jump table
.4byte _08080AFA @ case 0
.4byte _08080B5C @ case 1
.4byte _08080B5C @ case 2
.4byte _08080B5C @ case 3
.4byte _08080B5C @ case 4
.4byte _08080B5C @ case 5
.4byte _08080B5C @ case 6
.4byte _08080B5C @ case 7
.4byte _08080AFA @ case 8
.4byte _08080B5C @ case 9
.4byte _08080B5C @ case 10
.4byte _08080B5C @ case 11
.4byte _08080B5C @ case 12
.4byte _08080B5C @ case 13
.4byte _08080AF4 @ case 14
.4byte _08080B5C @ case 15
.4byte _08080B5C @ case 16
.4byte _08080B5C @ case 17
.4byte _08080B5C @ case 18
.4byte _08080B5C @ case 19
.4byte _08080B5C @ case 20
.4byte _08080B5C @ case 21
.4byte _08080B5C @ case 22
.4byte _08080AFA @ case 23
.4byte _08080B5C @ case 24
.4byte _08080B5C @ case 25
.4byte _08080B5C @ case 26
.4byte _08080B5C @ case 27
.4byte _08080AFA @ case 28
_08080AF4:
ldrb r0, [r2, #4]
cmp r0, #0x48
beq _08080B5C
_08080AFA:
ldr r3, [r7, #0x30]
movs r0, #0x32
ldrsh r1, [r3, r0]
ldrh r0, [r7, #8]
subs r6, r1, r0
movs r0, #0x2e
ldrsh r1, [r3, r0]
ldrh r0, [r7, #6]
subs r5, r1, r0
asrs r0, r5, #4
movs r2, #0x3f
ands r0, r2
asrs r1, r6, #4
ands r1, r2
lsls r1, r1, #6
orrs r0, r1
adds r3, #0x38
ldrb r1, [r3]
bl sub_080002C8
adds r4, r0, #0
ldr r0, [r7, #0x30]
adds r0, #0x38
ldrb r2, [r0]
adds r0, r5, #0
adds r1, r6, #0
bl sub_080002A8
ldr r1, _08080B48 @ =gScreenTransition
strh r0, [r1, #0xa]
cmp r4, #0x3f
beq _08080B50
cmp r4, #0x3f
bhi _08080B4C
cmp r4, #0x29
bhi _08080B5C
cmp r4, #0x28
blo _08080B5C
b _08080B50
.align 2, 0
_08080B48: .4byte gScreenTransition
_08080B4C:
cmp r4, #0xf1
bne _08080B5C
_08080B50:
adds r0, r5, #0
adds r1, r6, #0
movs r2, #0xff
movs r3, #0xa
bl sub_080806BC
_08080B5C:
pop {r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_start sub_08080B60
sub_08080B60: @ 0x08080B60
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
ldr r1, _08080B90 @ =0x00005004
adds r4, r0, r1
ldr r2, _08080B94 @ =gUnk_080B37A0
mov r8, r2
movs r3, #0
ldr r1, _08080B98 @ =0x00003FFF
mov ip, r1
ldr r7, _08080B9C @ =gUnk_080B7910
ldr r2, _08080BA0 @ =0x0000B004
adds r1, r0, r2
adds r2, r0, #4
ldr r6, _08080BA4 @ =0xFFFFC000
ldr r5, _08080BA8 @ =0x00000FFF
_08080B80:
ldrh r0, [r2]
cmp r0, ip
bhi _08080BAC
lsls r0, r0, #1
adds r0, r0, r4
ldrh r0, [r0]
add r0, r8
b _08080BB0
.align 2, 0
_08080B90: .4byte 0x00005004
_08080B94: .4byte gUnk_080B37A0
_08080B98: .4byte 0x00003FFF
_08080B9C: .4byte gUnk_080B7910
_08080BA0: .4byte 0x0000B004
_08080BA4: .4byte 0xFFFFC000
_08080BA8: .4byte 0x00000FFF
_08080BAC:
adds r0, r0, r6
adds r0, r0, r7
_08080BB0:
ldrb r0, [r0]
strb r0, [r1]
adds r1, #1
adds r2, #2
adds r3, #1
cmp r3, r5
bls _08080B80
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_08080BC4
sub_08080BC4: @ 0x08080BC4
push {r4, r5, r6, lr}
ldr r3, _08080C40 @ =gRoomControls
movs r0, #0xa
ldrsh r1, [r3, r0]
ldrh r0, [r3, #6]
subs r5, r1, r0
movs r2, #0xf
ands r5, r2
movs r1, #0xc
ldrsh r0, [r3, r1]
ldrh r1, [r3, #8]
subs r0, r0, r1
ands r0, r2
adds r6, r0, #0
adds r6, #8
ldrh r2, [r3, #0x16]
adds r4, r2, #0
cmp r4, #0
beq _08080C50
subs r2, #1
strh r2, [r3, #0x16]
ldrb r0, [r3, #0x14]
lsls r0, r0, #4
movs r1, #0xe
ands r2, r1
adds r0, r0, r2
ldr r1, _08080C44 @ =gUnk_080169A4
adds r2, r0, r1
ldr r4, _08080C48 @ =gUnk_02025EB0
ldr r1, [r4]
cmp r1, #0
beq _08080C16
movs r0, #0
ldrsb r0, [r2, r0]
adds r0, r0, r5
strh r0, [r1, #2]
ldr r1, [r4]
movs r0, #1
ldrsb r0, [r2, r0]
adds r0, r0, r6
strh r0, [r1, #4]
_08080C16:
ldr r4, _08080C4C @ =gUnk_0200B650
ldr r1, [r4]
cmp r1, #0
beq _08080C30
movs r0, #0
ldrsb r0, [r2, r0]
adds r0, r0, r5
strh r0, [r1, #2]
ldr r1, [r4]
movs r0, #1
ldrsb r0, [r2, r0]
adds r0, r0, r6
strh r0, [r1, #4]
_08080C30:
ldrb r1, [r2]
adds r0, r3, #0
adds r0, #0x24
strb r1, [r0]
ldrb r1, [r2, #1]
adds r0, #1
strb r1, [r0]
b _08080C76
.align 2, 0
_08080C40: .4byte gRoomControls
_08080C44: .4byte gUnk_080169A4
_08080C48: .4byte gUnk_02025EB0
_08080C4C: .4byte gUnk_0200B650
_08080C50:
ldr r0, _08080C78 @ =gUnk_02025EB0
ldr r1, [r0]
cmp r1, #0
beq _08080C5E
strh r5, [r1, #2]
ldr r0, [r0]
strh r6, [r0, #4]
_08080C5E:
ldr r0, _08080C7C @ =gUnk_0200B650
ldr r1, [r0]
cmp r1, #0
beq _08080C6C
strh r5, [r1, #2]
ldr r0, [r0]
strh r6, [r0, #4]
_08080C6C:
adds r0, r3, #0
adds r0, #0x24
strb r4, [r0]
adds r0, #1
strb r4, [r0]
_08080C76:
pop {r4, r5, r6, pc}
.align 2, 0
_08080C78: .4byte gUnk_02025EB0
_08080C7C: .4byte gUnk_0200B650
thumb_func_start sub_08080C80
sub_08080C80: @ 0x08080C80
push {r4, lr}
bl sub_080197D4
ldr r0, _08080CA8 @ =gMapDataBottom
ldr r4, _08080CAC @ =gRoomControls
ldrh r1, [r4, #0x1e]
lsrs r1, r1, #4
ldrh r2, [r4, #0x20]
lsrs r2, r2, #4
bl sub_0807C8B0
ldr r0, _08080CB0 @ =gMapDataTop
ldrh r1, [r4, #0x1e]
lsrs r1, r1, #4
ldrh r2, [r4, #0x20]
lsrs r2, r2, #4
bl sub_0807C8B0
pop {r4, pc}
.align 2, 0
_08080CA8: .4byte gMapDataBottom
_08080CAC: .4byte gRoomControls
_08080CB0: .4byte gMapDataTop
thumb_func_start sub_08080CB4
sub_08080CB4: @ 0x08080CB4
push {r4, r5, lr}
adds r4, r0, #0
adds r1, r4, #0
adds r1, #0x58
ldrb r0, [r4, #0xa]
ldrb r1, [r1]
cmp r0, r1
beq _08080CF0
adds r1, r0, #0
adds r0, r4, #0
bl InitAnimationForceUpdate
ldrb r0, [r4, #0xa]
cmp r0, #0x5c
beq _08080CD4
b _08080E00
_08080CD4:
ldrb r0, [r4, #0xb]
lsls r0, r0, #3
ldr r1, _08080CEC @ =gUnk_080C9CBC
adds r0, r0, r1
ldrb r0, [r0]
movs r1, #0xf
ands r1, r0
lsls r0, r0, #4
orrs r0, r1
strb r0, [r4, #0x1a]
b _08080E00
.align 2, 0
_08080CEC: .4byte gUnk_080C9CBC
_08080CF0:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
ldrb r0, [r4, #0x18]
lsls r0, r0, #0x1e
cmp r0, #0
bne _08080D00
b _08080E00
_08080D00:
ldrb r0, [r4, #0xa]
subs r0, #0x40
cmp r0, #0x22
bhi _08080E00
lsls r0, r0, #2
ldr r1, _08080D14 @ =_08080D18
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08080D14: .4byte _08080D18
_08080D18: @ jump table
.4byte _08080DEE @ case 0
.4byte _08080DEE @ case 1
.4byte _08080DEE @ case 2
.4byte _08080DEE @ case 3
.4byte _08080E00 @ case 4
.4byte _08080E00 @ case 5
.4byte _08080E00 @ case 6
.4byte _08080E00 @ case 7
.4byte _08080E00 @ case 8
.4byte _08080E00 @ case 9
.4byte _08080E00 @ case 10
.4byte _08080E00 @ case 11
.4byte _08080E00 @ case 12
.4byte _08080E00 @ case 13
.4byte _08080E00 @ case 14
.4byte _08080E00 @ case 15
.4byte _08080E00 @ case 16
.4byte _08080E00 @ case 17
.4byte _08080E00 @ case 18
.4byte _08080E00 @ case 19
.4byte _08080E00 @ case 20
.4byte _08080E00 @ case 21
.4byte _08080E00 @ case 22
.4byte _08080E00 @ case 23
.4byte _08080E00 @ case 24
.4byte _08080E00 @ case 25
.4byte _08080E00 @ case 26
.4byte _08080E00 @ case 27
.4byte _08080DEE @ case 28
.4byte _08080E00 @ case 29
.4byte _08080E00 @ case 30
.4byte _08080E00 @ case 31
.4byte _08080DA4 @ case 32
.4byte _08080E00 @ case 33
.4byte _08080DEE @ case 34
_08080DA4:
adds r5, r4, #0
adds r5, #0x6a
ldrb r0, [r5]
cmp r0, #0
beq _08080DB4
subs r0, #1
strb r0, [r5]
b _08080E00
_08080DB4:
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0xa
strb r0, [r5]
adds r0, r4, #0
movs r1, #7
movs r2, #0
bl CreateFx
adds r1, r0, #0
cmp r1, #0
beq _08080E00
adds r0, r4, #0
adds r0, #0x62
ldrb r0, [r0]
adds r2, r1, #0
adds r2, #0x62
strb r0, [r2]
adds r0, r4, #0
adds r0, #0x63
ldrb r0, [r0]
adds r2, #1
strb r0, [r2]
adds r0, r4, #0
bl ResolveEntityOnTop
b _08080E00
_08080DEE:
ldr r0, _08080E04 @ =gScreenTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
cmp r0, #0
bne _08080E00
adds r0, r4, #0
bl CreateSparkle
_08080E00:
pop {r4, r5, pc}
.align 2, 0
_08080E04: .4byte gScreenTransition
asm/code_080A5574.s
+17 -17
View File
@@ -6061,7 +6061,7 @@ sub_080A8470: @ 0x080A8470
cmp r0, #0x68
bne _080A848E
movs r0, #0x86
bl sub_08004488
bl EnqueueSFX
_080A848E:
adds r0, r4, #0
bl DeleteEntity
@@ -6115,7 +6115,7 @@ sub_080A84C8: @ 0x080A84C8
strb r0, [r1]
_080A84F0:
ldr r0, _080A8500 @ =0x0000018D
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
movs r1, #0x18
bl InitializeAnimation
@@ -6328,7 +6328,7 @@ sub_080A8680: @ 0x080A8680
strb r1, [r0, #0xf]
movs r0, #0x8c
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
pop {pc}
thumb_func_start sub_080A86A0
@@ -6344,7 +6344,7 @@ sub_080A86A0: @ 0x080A86A0
strh r3, [r0, #0x24]
movs r0, #0xc7
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
pop {pc}
thumb_func_start sub_080A86BC
@@ -6810,7 +6810,7 @@ _080A8A16:
movs r1, #1
bl InitializeAnimation
movs r0, #0x84
bl sub_08004488
bl EnqueueSFX
movs r0, #3
strb r0, [r5, #0xc]
b _080A8A44
@@ -6893,7 +6893,7 @@ _080A8AAA:
adds r0, r2, #0
bl InitializeAnimation
ldr r0, _080A8AC4 @ =0x0000015F
bl sub_08004488
bl EnqueueSFX
_080A8AC2:
pop {pc}
.align 2, 0
@@ -7053,7 +7053,7 @@ _080A8BDA:
bl InitializeAnimation
movs r0, #0xaf
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_080A8BF4:
pop {pc}
.align 2, 0
@@ -7198,7 +7198,7 @@ _080A8CEE:
bl InitializeAnimation
movs r0, #0xb0
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_080A8D08:
pop {pc}
.align 2, 0
@@ -8110,7 +8110,7 @@ sub_080A93DC: @ 0x080A93DC
bl InitializeAnimation
movs r0, #0xc5
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
bl sub_0806F69C
b _080A9424
@@ -8199,7 +8199,7 @@ sub_080A9488: @ 0x080A9488
lsrs r0, r0, #3
strb r0, [r4, #0x14]
movs r0, #0x74
bl sub_08004488
bl EnqueueSFX
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl sub_080A94C0
@@ -9728,7 +9728,7 @@ sub_080A9FD0: @ 0x080A9FD0
ands r0, r1
strb r0, [r2]
ldr r0, _080AA038 @ =0x0000015D
bl sub_08004488
bl EnqueueSFX
_080A9FF2:
movs r0, #0x2e
ldrsh r1, [r5, r0]
@@ -9906,7 +9906,7 @@ _080AA136:
bl DeleteThisEntity
_080AA14E:
movs r0, #0xf2
bl sub_08004488
bl EnqueueSFX
movs r4, #1
strb r4, [r6, #0xc]
movs r0, #0xff
@@ -10715,7 +10715,7 @@ _080AA774:
adds r0, r4, #0
bl InitAnimationForceUpdate
ldr r0, _080AA788 @ =0x00000101
bl sub_08004488
bl EnqueueSFX
_080AA784:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -10780,7 +10780,7 @@ _080AA7DA:
strb r0, [r5]
movs r0, #0x80
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_080AA806:
ldrb r1, [r5]
movs r0, #0x80
@@ -10989,7 +10989,7 @@ _080AA920:
strh r0, [r7, #0x32]
movs r0, #0x80
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_080AA99A:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -13118,7 +13118,7 @@ sub_080AB950: @ 0x080AB950
cmp r0, #0
bne _080AB99C
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
ldrb r0, [r4, #0x15]
lsrs r0, r0, #3
ldr r1, _080AB994 @ =gUnk_0812A6C4
@@ -15575,7 +15575,7 @@ sub_080ACB90: @ 0x080ACB90
movs r2, #0x40
bl CreateFx
ldr r0, _080ACBC8 @ =0x00000119
bl sub_08004488
bl EnqueueSFX
bl DeleteThisEntity
_080ACBC6:
pop {r4, pc}
asm/code_080AD90C.s
+2 -2
View File
@@ -3036,8 +3036,8 @@ _080AEF7E:
pop {r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_start sub_080AEF88
sub_080AEF88: @ 0x080AEF88
thumb_func_start ProcessMovement
ProcessMovement: @ 0x080AEF88
push {r4, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x15]
asm/cucco.s
+1 -1
View File
@@ -93,7 +93,7 @@ _0806E52C:
lsls r1, r1, #1
adds r1, r1, r4
ldrh r0, [r1]
bl sub_08004488
bl EnqueueSFX
_0806E552:
adds r0, r5, #0
bl sub_0806E65C
asm/cuccoAggr.s
+6 -6
View File
@@ -194,7 +194,7 @@ sub_08038DD8: @ 0x08038DD8
movs r1, #4
bl InitializeAnimation
ldr r0, _08038E14 @ =0x000001D9
bl sub_08004488
bl EnqueueSFX
pop {pc}
.align 2, 0
_08038E10: .4byte gUnk_080CF7BC
@@ -238,7 +238,7 @@ sub_08038E18: @ 0x08038E18
ands r0, r1
strb r0, [r4, #0x15]
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
_08038E70:
@@ -304,7 +304,7 @@ sub_08038ED0: @ 0x08038ED0
sub_08038EE0: @ 0x08038EE0
push {r4, lr}
adds r4, r0, #0
bl sub_080AEF88
bl ProcessMovement
adds r0, r4, #0
bl GetNextFrame
adds r0, r4, #0
@@ -362,7 +362,7 @@ sub_08038F44: @ 0x08038F44
adds r0, r4, #0
bl sub_080390F8
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
movs r1, #0xc0
lsls r1, r1, #5
adds r0, r4, #0
@@ -519,7 +519,7 @@ _0803906C:
movs r1, #0xeb
lsls r1, r1, #1
adds r0, r5, r1
bl sub_08004488
bl EnqueueSFX
b _080390BC
_080390AA:
movs r0, #4
@@ -743,7 +743,7 @@ sub_08039218: @ 0x08039218
bl InitializeAnimation
_0803924C:
ldr r0, _0803925C @ =0x000001D9
bl sub_08004488
bl EnqueueSFX
pop {pc}
.align 2, 0
_08039254: .4byte gUnk_080CF824
asm/cuccoChick.s
+1 -1
View File
@@ -81,7 +81,7 @@ _0806E782:
cmp r1, #0
beq _0806E7A8
movs r0, #0xd6
bl sub_08004488
bl EnqueueSFX
_0806E7A8:
adds r0, r4, #0
bl sub_0806E838
asm/deathFx.s
+1 -1
View File
@@ -125,7 +125,7 @@ _08081702:
movs r0, #1
strb r0, [r4, #0xc]
movs r0, #0xff
bl sub_08004488
bl EnqueueSFX
_0808170C:
adds r0, r4, #0
movs r1, #3
asm/dog.s
+3 -3
View File
@@ -303,7 +303,7 @@ sub_08069D54: @ 0x08069D54
adds r0, r4, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
ldrh r1, [r4, #0x2a]
movs r0, #0x2e
ldrsh r2, [r4, r0]
@@ -473,9 +473,9 @@ _08069EA0:
adds r0, r4, #0
bl sub_080788E0
movs r0, #0xd1
bl sub_08004488
bl EnqueueSFX
movs r0, #0xcd
bl sub_08004488
bl EnqueueSFX
_08069EC8:
pop {r4, r5, r6, r7, pc}
.align 2, 0
asm/enemy4D.s
+2 -115
View File
@@ -6,119 +6,6 @@
.text
thumb_func_start Enemy4D
Enemy4D: @ 0x0803EAEC
push {lr}
ldr r1, _0803EAF8 @ =gUnk_080D0880
bl EnemyFunctionHandler
pop {pc}
.align 2, 0
_0803EAF8: .4byte gUnk_080D0880
thumb_func_start sub_0803EAFC
sub_0803EAFC: @ 0x0803EAFC
push {lr}
ldr r2, _0803EB10 @ =gUnk_080D0898
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0803EB10: .4byte gUnk_080D0898
thumb_func_start sub_0803EB14
sub_0803EB14: @ 0x0803EB14
push {lr}
ldr r1, _0803EB20 @ =gUnk_080D0880
bl sub_0804AA30
pop {pc}
.align 2, 0
_0803EB20: .4byte gUnk_080D0880
thumb_func_start sub_0803EB24
sub_0803EB24: @ 0x0803EB24
push {r4, lr}
adds r4, r0, #0
bl sub_08001324
thumb_func_start sub_0803EB2C
sub_0803EB2C: @ 0x0803EB2C
adds r0, r4, #0
bl sub_0803EAFC
pop {r4, pc}
thumb_func_start sub_0803EB34
sub_0803EB34: @ 0x0803EB34
push {lr}
movs r1, #0xff
movs r2, #0x57
bl CreateDeathFx
pop {pc}
thumb_func_start nullsub_21
nullsub_21: @ 0x0803EB40
bx lr
.align 2, 0
thumb_func_start sub_0803EB44
sub_0803EB44: @ 0x0803EB44
push {r4, lr}
adds r4, r0, #0
bl sub_0804A720
adds r0, r4, #0
movs r1, #0x19
movs r2, #0
bl sub_0804A98C
cmp r0, #0
beq _0803EBB2
str r4, [r0, #0x50]
str r0, [r4, #0x54]
ldrb r1, [r4, #0x10]
movs r0, #0x80
movs r2, #0
orrs r0, r1
strb r0, [r4, #0x10]
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
movs r0, #2
strb r0, [r4, #0x14]
adds r0, r4, #0
adds r0, #0x7b
strb r2, [r0]
adds r0, #1
strb r2, [r0]
adds r1, r4, #0
adds r1, #0x7e
movs r0, #0x28
strb r0, [r1]
adds r1, #1
movs r0, #0xfe
strb r0, [r1]
ldrh r1, [r4, #0x2e]
adds r0, r4, #0
adds r0, #0x80
strh r1, [r0]
ldrh r0, [r4, #0x32]
adds r1, r4, #0
adds r1, #0x82
strh r0, [r1]
ldrb r1, [r4, #0x14]
lsls r1, r1, #2
adds r0, r4, #0
bl InitAnimationForceUpdate
adds r0, r4, #0
bl sub_0803EE8C
_0803EBB2:
pop {r4, pc}
thumb_func_start sub_0803EBB4
sub_0803EBB4: @ 0x0803EBB4
push {r4, lr}
@@ -285,7 +172,7 @@ _0803ECD8:
movs r1, #0x10
bl sub_0803E94C
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
_0803ED02:
pop {r4, r5, r6, pc}
@@ -347,7 +234,7 @@ sub_0803ED40: @ 0x0803ED40
movs r0, #0xf6
strb r0, [r1]
adds r0, #0x65
bl sub_08004488
bl EnqueueSFX
_0803ED74:
pop {pc}
.align 2, 0
asm/eyeSwitch.s
+1 -1
View File
@@ -109,7 +109,7 @@ _08088728:
ands r0, r1
strb r0, [r4, #0x10]
ldr r0, _0808875C @ =0x00000111
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
asm/eyegore.s
+6 -6
View File
@@ -105,7 +105,7 @@ _08030AC0:
movs r0, #0x86
lsls r0, r0, #1
_08030AE0:
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
bl sub_08031344
b _08030B0E
@@ -124,7 +124,7 @@ _08030AFA:
movs r0, #0xf
strb r0, [r1]
movs r0, #0xfe
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
bl sub_08031344
_08030B0E:
@@ -563,7 +563,7 @@ sub_08030E3C: @ 0x08030E3C
lsls r1, r1, #9
str r1, [r0, #0x20]
ldr r0, _08030E54 @ =0x00000157
bl sub_08004488
bl EnqueueSFX
pop {pc}
.align 2, 0
_08030E54: .4byte 0x00000157
@@ -589,7 +589,7 @@ sub_08030E70: @ 0x08030E70
bl sub_08030E80
movs r0, #0xac
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
pop {pc}
thumb_func_start sub_08030E80
@@ -1171,7 +1171,7 @@ _080312E2:
cmp r0, #0
bne _0803131C
adds r0, r6, #0
bl sub_080AEF88
bl ProcessMovement
cmp r0, #0
bne _0803131C
adds r2, r6, #0
@@ -1192,7 +1192,7 @@ _08031310:
b _0803131C
_08031316:
adds r0, r6, #0
bl sub_080AEF88
bl ProcessMovement
_0803131C:
pop {r4, r5, r6, pc}
.align 2, 0
asm/fairy.s
+1 -1
View File
@@ -188,7 +188,7 @@ sub_0808D7B4: @ 0x0808D7B4
bl sub_0805E3A0
movs r0, #0x9b
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
ldrb r0, [r4, #0xb]
cmp r0, #2
beq _0808D834
asm/fallingBoulder.s
+1 -1
View File
@@ -216,7 +216,7 @@ _0802C36A:
bne _0802C3CC
movs r0, #0xa6
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
ldrb r1, [r4, #0x10]
movs r0, #0x80
orrs r0, r1
asm/fan.s
+1 -1
View File
@@ -347,7 +347,7 @@ sub_0809F0E4: @ 0x0809F0E4
push {r4, r5, lr}
adds r5, r0, #0
ldr r0, _0809F124 @ =0x00000183
bl sub_08004488
bl EnqueueSFX
ldrb r0, [r5, #0xa]
movs r1, #2
eors r1, r0
asm/figurineDevice.s
+1 -1
View File
@@ -266,7 +266,7 @@ _08087D60:
bl PositionRelative
_08087DAA:
ldr r0, _08087DB8 @ =0x00000111
bl sub_08004488
bl EnqueueSFX
_08087DB0:
pop {r4, r5, pc}
.align 2, 0
asm/flyingPot.s
+1 -1
View File
@@ -342,7 +342,7 @@ _080372CC:
adds r0, r5, #0
movs r1, #1
movs r2, #0x40
bl sub_08049F64
bl PlayerInRange
cmp r0, #0
beq _080372E2
movs r0, #2
asm/frozenWaterElement.s
+2 -2
View File
@@ -96,7 +96,7 @@ sub_0809BF1C: @ 0x0809BF1C
lsls r0, r0, #1
strh r0, [r1]
adds r0, #0x73
bl sub_08004488
bl EnqueueSFX
_0809BF6C:
pop {r4, pc}
.align 2, 0
@@ -129,7 +129,7 @@ _0809BFA0:
cmp r1, #0
bne _0809BFAE
ldr r0, _0809C09C @ =0x000001B3
bl sub_08004488
bl EnqueueSFX
_0809BFAE:
ldrh r0, [r5]
cmp r0, #0x77
asm/gibdo.s
+3 -3
View File
@@ -196,7 +196,7 @@ _080375D2:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
cmp r0, #0
bne _080375F4
ldrb r0, [r4, #0xf]
@@ -263,7 +263,7 @@ _08037652:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
cmp r0, #0
bne _0803767C
ldrb r0, [r4, #0xf]
@@ -316,7 +316,7 @@ _080376B6:
movs r0, #0x27
strb r0, [r1]
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
_080376CC:
pop {r4, pc}
.align 2, 0
asm/guardWithSpear.s
+3 -3
View File
@@ -84,7 +84,7 @@ _080640E8:
bl InitializeAnimation
_0806410A:
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
movs r0, #0x2e
ldrsh r1, [r4, r0]
adds r2, r4, #0
@@ -213,7 +213,7 @@ _080641E6:
movs r0, #0x32
ldrsh r4, [r5, r0]
adds r0, r5, #0
bl sub_080AEF88
bl ProcessMovement
movs r1, #0x32
ldrsh r0, [r5, r1]
adds r6, r5, #0
@@ -358,7 +358,7 @@ _08064306:
movs r0, #0x2e
ldrsh r4, [r5, r0]
adds r0, r5, #0
bl sub_080AEF88
bl ProcessMovement
movs r1, #0x2e
ldrsh r0, [r5, r1]
adds r6, r5, #0
asm/helmasaur.s
+1 -1
View File
@@ -533,7 +533,7 @@ _0802BF3A:
sub_0802BF3C: @ 0x0802BF3C
push {r4, lr}
adds r4, r0, #0
bl sub_080AEF88
bl ProcessMovement
adds r0, r4, #0
bl GetNextFrame
ldrb r0, [r4, #0xe]
asm/hiddenLadderDown.s
-158
View File
@@ -5,161 +5,3 @@
.syntax unified
.text
thumb_func_start HiddenLadderDown
HiddenLadderDown: @ 0x08091EF4
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
cmp r0, #1
bhi _08091F0E
ldr r0, _08091F10 @ =gUnk_08122604
ldrb r1, [r2, #0xc]
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r2, #0
bl _call_via_r1
_08091F0E:
pop {pc}
.align 2, 0
_08091F10: .4byte gUnk_08122604
thumb_func_start sub_08091F14
sub_08091F14: @ 0x08091F14
push {r4, r5, lr}
adds r4, r0, #0
movs r2, #0
movs r0, #1
strb r0, [r4, #0xc]
adds r3, r4, #0
adds r3, #0x29
ldrb r0, [r3]
movs r1, #7
orrs r0, r1
strb r0, [r3]
adds r0, r4, #0
adds r0, #0x58
strb r2, [r0]
movs r0, #0x2e
ldrsh r1, [r4, r0]
ldr r2, _08091FEC @ =gRoomControls
ldrh r0, [r2, #6]
subs r1, r1, r0
asrs r1, r1, #4
movs r3, #0x3f
ands r1, r3
movs r5, #0x32
ldrsh r0, [r4, r5]
ldrh r2, [r2, #8]
subs r0, r0, r2
asrs r0, r0, #4
ands r0, r3
lsls r0, r0, #6
orrs r1, r0
adds r5, r4, #0
adds r5, #0x70
strh r1, [r5]
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl CheckFlags
cmp r0, #0
beq _08091FEA
movs r0, #2
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x18]
subs r0, #6
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
movs r0, #0xd1
lsls r0, r0, #1
ldrh r1, [r5]
subs r1, #0x41
adds r4, #0x38
ldrb r2, [r4]
bl SetTileType
ldr r0, _08091FF0 @ =0x000001A3
ldrh r1, [r5]
subs r1, #0x40
ldrb r2, [r4]
bl SetTileType
movs r0, #0xd2
lsls r0, r0, #1
ldrh r1, [r5]
subs r1, #0x3f
ldrb r2, [r4]
bl SetTileType
ldr r0, _08091FF4 @ =0x000001A5
ldrh r1, [r5]
subs r1, #1
ldrb r2, [r4]
bl SetTileType
movs r0, #0xd3
lsls r0, r0, #1
ldrh r1, [r5]
ldrb r2, [r4]
bl SetTileType
ldr r0, _08091FF8 @ =0x000001A7
ldrh r1, [r5]
adds r1, #1
ldrb r2, [r4]
bl SetTileType
movs r0, #0xd4
lsls r0, r0, #1
ldrh r1, [r5]
adds r1, #0x3f
ldrb r2, [r4]
bl SetTileType
ldr r0, _08091FFC @ =0x000001A9
ldrh r1, [r5]
adds r1, #0x40
ldrb r2, [r4]
bl SetTileType
movs r0, #0xd5
lsls r0, r0, #1
ldrh r1, [r5]
adds r1, #0x41
ldrb r2, [r4]
bl SetTileType
_08091FEA:
pop {r4, r5, pc}
.align 2, 0
_08091FEC: .4byte gRoomControls
_08091FF0: .4byte 0x000001A3
_08091FF4: .4byte 0x000001A5
_08091FF8: .4byte 0x000001A7
_08091FFC: .4byte 0x000001A9
thumb_func_start sub_08092000
sub_08092000: @ 0x08092000
push {r4, lr}
adds r4, r0, #0
adds r0, #0x70
ldrh r0, [r0]
adds r1, r4, #0
adds r1, #0x38
ldrb r1, [r1]
bl GetTileType
movs r1, #0xd3
lsls r1, r1, #1
cmp r0, r1
bne _08092034
movs r0, #2
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x18]
subs r0, #6
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
adds r0, r4, #0
adds r0, #0x86
ldrh r0, [r0]
bl SetFlag
_08092034:
pop {r4, pc}
.align 2, 0
asm/itemOnGround.s
-1593
View File
File diff suppressed because it is too large Load Diff
asm/kid.s
+1 -1
View File
@@ -1173,7 +1173,7 @@ _080629B4:
strh r1, [r0]
_080629D2:
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
movs r3, #0x2e
ldrsh r1, [r4, r3]
adds r2, r4, #0
asm/lavaPlatform.s
+4 -4
View File
@@ -73,7 +73,7 @@ sub_0809229C: @ 0x0809229C
bl InitAnimationForceUpdate
movs r0, #0xbf
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
ldr r0, [r4, #0x54]
movs r1, #3
bl InitializeAnimation
@@ -281,7 +281,7 @@ _08092434:
movs r1, #2
bl InitializeAnimation
ldr r0, _08092468 @ =0x0000017B
bl sub_08004488
bl EnqueueSFX
_08092462:
pop {r4, pc}
.align 2, 0
@@ -335,7 +335,7 @@ _080924B8:
strb r0, [r3]
movs r0, #0xbe
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
b _080924DC
_080924CC:
movs r0, #2
@@ -344,7 +344,7 @@ _080924CC:
beq _080924DC
strb r2, [r3]
ldr r0, _080924E0 @ =0x0000017D
bl sub_08004488
bl EnqueueSFX
_080924DC:
pop {r4, r5, pc}
.align 2, 0
asm/likeLike.s
+2 -2
View File
@@ -269,7 +269,7 @@ _08027F38:
strb r0, [r4, #0xe]
_08027F5A:
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
adds r0, r4, #0
bl GetNextFrame
b _08027F7C
@@ -485,7 +485,7 @@ _080280F0:
bne _08028102
movs r0, #0x82
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_08028102:
pop {r4, r5, pc}
.align 2, 0
asm/lockedDoor.s
+2 -2
View File
@@ -232,7 +232,7 @@ sub_080834B4: @ 0x080834B4
ldrb r2, [r2]
bl SetTile
ldr r0, _080834E8 @ =0x0000010B
bl sub_08004488
bl EnqueueSFX
_080834E6:
pop {pc}
.align 2, 0
@@ -323,7 +323,7 @@ _0808357A:
adds r0, r4, #0
bl sub_08083814
ldr r0, _08083590 @ =0x0000010B
bl sub_08004488
bl EnqueueSFX
_0808358C:
pop {r4, pc}
.align 2, 0
asm/macros.inc
+1
View File
@@ -2,3 +2,4 @@
.include "asm/macros/function.inc"
.include "asm/macros/m4a.inc"
.include "asm/macros/map.inc"
.include "asm/macros/entity.inc"
asm/macros/entity.inc
Executable
+79
View File
@@ -0,0 +1,79 @@
.ifndef GUARD_ASM_MACROS_ENTITY_INC
.set GUARD_ASM_MACROS_ENTITY_INC, 1
.set ENTITY_TYPE_ENEMY, 0x3
.set ENTITY_TYPE_SIGN, 0x5
.set ENTITY_TYPE_OBJECT, 0x6
.set OBJECT_ITEM, 0x0
.set OBJECT_MINISH_LILYPAD, 0x73
.set ENEMY_OCTOROK, 0x0
.set ENEMY_CHUCHU, 0x1
.set ENEMY_TREE_ITEM, 0x65
.macro object_minish_lilypad x, y, room_property, collision=0
.byte ENTITY_TYPE_OBJECT | ((\collision) << 4)
.byte 0x0F
.byte OBJECT_MINISH_LILYPAD
.byte 0x00
.byte \room_property
.byte 0x00, 0x00, 0x00
.2byte \x, \y
.2byte 0x0, 0x0
.endm
.macro object_item x, y, item, flag, collision=0
.byte ENTITY_TYPE_OBJECT | ((\collision) << 4)
.byte 0x0F
.byte OBJECT_ITEM
.byte \item
.byte 0x00
.byte 0x04 @ stationary item
.byte 0x00, 0x00
.2byte \x, \y
.2byte 0x0, \flag
.endm
.macro enemy_octorok x, y, bound_x, bound_y, bound_tile_width, bound_tile_height, collision=0
.byte ENTITY_TYPE_ENEMY | ((\collision) << 4)
.byte 0x0F
.byte ENEMY_OCTOROK
.byte 0x00, 0x00, 0x00
.byte \bound_tile_width, \bound_tile_height
.2byte \x, \y
.2byte \bound_x, \bound_y
.endm
.macro enemy_chuchu x, y, bound_x, bound_y, bound_tile_width, bound_tile_height, collision=0
.byte ENTITY_TYPE_ENEMY | ((\collision) << 4)
.byte 0x0F
.byte ENEMY_CHUCHU
.byte 0x00, 0x00, 0x00
.byte \bound_tile_width, \bound_tile_height
.2byte \x, \y
.2byte \bound_x, \bound_y
.endm
.macro enemy_tree_item x, y, unknown, collision=0
.byte ENTITY_TYPE_ENEMY | ((\collision) << 4)
.byte 0x0F
.byte ENEMY_TREE_ITEM
.byte \unknown, 0x00, 0x00, 0x00, 0x00
.2byte \x, \y
.2byte 0x00, 0x00
.endm
.macro entity_list_end
.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.endm
.macro chest type, id, item, subnum, tileset_id
.2byte (\map_x) << 4
.2byte (\map_y) << 4
.2byte \pixel_width
.2byte \pixel_height
.2byte \tileset_id
.endm
.endif @ GUARD_ASM_MACROS_ENTITY_INC
asm/madderpillar.s
+9 -9
View File
@@ -117,7 +117,7 @@ _08029948:
movs r1, #0x7f
bl sub_0801D2B4
movs r0, #0xfe
bl sub_08004488
bl EnqueueSFX
ldr r0, [r5, #0x54]
strb r4, [r0, #0xc]
_08029970:
@@ -298,7 +298,7 @@ sub_08029AA4: @ 0x08029AA4
adds r0, r1, #0
bl sub_08029EEC
ldr r0, _08029ADC @ =0x0000019D
bl sub_08004488
bl EnqueueSFX
_08029ADA:
pop {pc}
.align 2, 0
@@ -335,7 +335,7 @@ sub_08029AE0: @ 0x08029AE0
bl sub_0801D2B4
movs r0, #0xc1
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_08029B28:
pop {r4, pc}
.align 2, 0
@@ -491,7 +491,7 @@ sub_08029C2C: @ 0x08029C2C
movs r1, #0x7f
bl sub_0801D2B4
movs r0, #0x6c
bl sub_08004488
bl EnqueueSFX
_08029C4E:
pop {pc}
@@ -625,7 +625,7 @@ sub_08029D14: @ 0x08029D14
movs r1, #0x7f
bl sub_0801D2B4
movs r0, #0x6c
bl sub_08004488
bl EnqueueSFX
b _08029D70
_08029D42:
adds r0, r4, #0
@@ -648,7 +648,7 @@ _08029D42:
ldr r0, _08029D74 @ =gUnk_080FD298
str r0, [r4, #0x48]
movs r0, #0x6b
bl sub_08004488
bl EnqueueSFX
_08029D70:
pop {r4, pc}
.align 2, 0
@@ -1121,7 +1121,7 @@ _0802A0B8:
movs r0, #0x32
ldrsh r6, [r4, r0]
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
adds r0, r4, #0
bl sub_08029F48
cmp r0, #0
@@ -1132,7 +1132,7 @@ _0802A0B8:
bl sub_08029EEC
movs r0, #0x82
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_0802A0E4:
movs r0, #0x2e
ldrsh r1, [r4, r0]
@@ -1286,7 +1286,7 @@ _0802A1B0: @ jump table
_0802A22C:
movs r0, #0x97
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_0802A234:
pop {pc}
.align 2, 0
asm/manager20.s
-74
View File
@@ -1,74 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0805B7A0
sub_0805B7A0: @ 0x0805B7A0
push {r4, r5, lr}
adds r5, r0, #0
ldrb r0, [r5, #0xe]
ldrb r1, [r5, #0xa]
ldrb r2, [r5, #0xb]
bl CreateObject
adds r4, r0, #0
cmp r4, #0
beq _0805B81A
ldrh r0, [r5, #0x3e]
adds r1, r4, #0
adds r1, #0x86
strh r0, [r1]
ldrh r0, [r5, #0x3e]
bl CheckFlags
cmp r0, #0
beq _0805B7EC
adds r0, r5, #0
adds r0, #0x36
ldrb r1, [r0]
adds r0, #1
ldrb r2, [r0]
movs r0, #0xf
ands r0, r2
lsls r0, r0, #8
orrs r1, r0
strh r1, [r4, #0x2e]
ldrh r1, [r5, #0x3c]
ldr r0, _0805B7E8 @ =0x00000FFF
ands r0, r1
strh r0, [r4, #0x32]
ldrh r0, [r5, #0x3c]
lsrs r0, r0, #0xc
b _0805B7FC
.align 2, 0
_0805B7E8: .4byte 0x00000FFF
_0805B7EC:
ldrh r0, [r5, #0x38]
strh r0, [r4, #0x2e]
ldrh r0, [r5, #0x3a]
strh r0, [r4, #0x32]
adds r0, r5, #0
adds r0, #0x37
ldrb r0, [r0]
lsrs r0, r0, #4
_0805B7FC:
adds r1, r4, #0
adds r1, #0x38
strb r0, [r1]
ldr r0, _0805B81C @ =gRoomControls
ldrh r1, [r0, #6]
ldrh r2, [r4, #0x2e]
adds r1, r1, r2
strh r1, [r4, #0x2e]
ldrh r0, [r0, #8]
ldrh r1, [r4, #0x32]
adds r0, r0, r1
strh r0, [r4, #0x32]
adds r0, r5, #0
bl DeleteManager
_0805B81A:
pop {r4, r5, pc}
.align 2, 0
_0805B81C: .4byte gRoomControls
asm/managerF.s
+1 -1
View File
@@ -747,7 +747,7 @@ _08059436:
strh r0, [r2, #0x32]
movs r0, #0xd8
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
bl DeleteThisEntity
_08059476:
pop {r4, pc}
asm/minecartDoor.s
+2 -2
View File
@@ -150,7 +150,7 @@ sub_08096BBC: @ 0x08096BBC
ldrb r2, [r2]
bl SetTile
ldr r0, _08096BF4 @ =0x0000010B
bl sub_08004488
bl EnqueueSFX
_08096BF2:
pop {r4, pc}
.align 2, 0
@@ -277,7 +277,7 @@ sub_08096CB0: @ 0x08096CB0
adds r0, r4, #0
bl sub_08083814
ldr r0, _08096CE8 @ =0x0000010B
bl sub_08004488
bl EnqueueSFX
_08096CE6:
pop {r4, pc}
.align 2, 0
asm/minishEzlo.s
+2 -2
View File
@@ -48,7 +48,7 @@ _08062FA0:
ands r0, r1
strb r0, [r4]
ldr r0, _08062FEC @ =0x000001CF
bl sub_08004488
bl EnqueueSFX
_08062FCC:
ldrb r1, [r4]
movs r0, #0x20
@@ -60,7 +60,7 @@ _08062FCC:
strb r0, [r4]
movs r0, #0x88
lsls r0, r0, #2
bl sub_08004488
bl EnqueueSFX
_08062FE4:
pop {r4, pc}
.align 2, 0
asm/moldworm.s
-1523
View File
File diff suppressed because it is too large Load Diff
asm/mountainMinish.s
+1 -1
View File
@@ -299,7 +299,7 @@ _08068068:
lsls r0, r0, #1
adds r0, r0, r4
ldrh r0, [r0]
bl sub_08004488
bl EnqueueSFX
_0806807E:
ldrb r1, [r6]
movs r0, #2
asm/mulldozer.s
+4 -4
View File
@@ -325,7 +325,7 @@ _08032EC0:
adds r0, r4, #0
bl sub_080331E8
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
pop {r4, pc}
.align 2, 0
@@ -333,7 +333,7 @@ _08032EC0:
sub_08032ED0: @ 0x08032ED0
push {r4, r5, lr}
adds r4, r0, #0
bl sub_080AEF88
bl ProcessMovement
adds r0, r4, #0
bl sub_08032F48
ldrb r0, [r4, #0xf]
@@ -428,7 +428,7 @@ _08032F82:
adds r0, r4, #0
bl sub_08032F48
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
pop {r4, pc}
thumb_func_start sub_08032F90
@@ -826,7 +826,7 @@ _08033238:
strh r0, [r4, #0x32]
movs r0, #0x86
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_08033278:
pop {r4, r5, r6, pc}
.align 2, 0
asm/non_matching/button/sub_08081E6C.s
+69
View File
@@ -0,0 +1,69 @@
sub_08081E6C: @ 0x08081E6C
push {r4, r5, r6, r7, lr}
add r4, r0, #0
add r0, #0x74
ldrh r6, [r0]
sub r0, #0x3c
ldrb r5, [r0]
add r0, r6, #0
add r1, r5, #0
bl GetTileType
add r7, r0, #0
ldr r0, _08081EEC @ =0x00003FFF
cmp r7, r0
bls _08081EE8
add r0, r5, #0
bl GetLayerByIndex
add r1, r0, #0
ldrb r0, [r4, #0xa]
mov r4, #0x78
cmp r0, #0
bne _08081E9A
mov r4, #0x7a
_08081E9A:
ldr r0, _08081EF0 @ =0x00007004
add r3, r1, r0
lsl r0, r4, #1
ldr r2, _08081EF4 @ =0x00006004
add r1, r1, r2
add r1, r1, r0
ldrh r0, [r1]
lsl r0, r0, #3
add r3, r3, r0
ldr r2, _08081EF8 @ =gUnk_02019EE0
cmp r5, #2
bne _08081EB4
ldr r2, _08081EFC @ =gMapDataTopSpecial
_08081EB4:
mov r0, #0x3f
and r0, r6
lsl r0, r0, #1
mov r1, #0xfc
lsl r1, r1, #4
and r1, r6
lsl r1, r1, #2
add r0, r0, r1
lsl r0, r0, #1
add r2, r2, r0
add r0, r2, #0
add r1, r3, #0
bl sub_08081F00
cmp r0, #0
bne _08081EE8
add r0, r4, #0
add r1, r6, #0
add r2, r5, #0
bl SetTileType
add r0, r7, #0
add r1, r6, #0
add r2, r5, #0
bl SetTile
_08081EE8:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08081EEC: .4byte 0x00003FFF
_08081EF0: .4byte 0x00007004
_08081EF4: .4byte 0x00006004
_08081EF8: .4byte gUnk_02019EE0
_08081EFC: .4byte gMapDataTopSpecial
asm/non_matching/moldworm/moldworm.inc
+83
View File
@@ -0,0 +1,83 @@
.syntax unified
.text
push {r4, r5, r6, lr}
adds r4, r0, #0
ldrh r5, [r4, #0x2e]
ldrh r6, [r4, #0x32]
ldrb r1, [r4, #0xa]
cmp r1, #0
bne _0802306C
ldrb r0, [r4, #0xc]
cmp r0, #0
beq _08023052
adds r0, r4, #0
bl sub_0802390C
_08023052:
adds r0, r4, #0
adds r0, #0x7c
ldrb r0, [r0]
adds r1, r4, #0
adds r1, #0x7d
strb r0, [r1]
ldr r1, _08023068 @ =gUnk_080CBC38
adds r0, r4, #0
bl EnemyFunctionHandler
b _08023090
.align 2, 0
_08023068: .4byte gUnk_080CBC38
_0802306C:
ldr r0, [r4, #0x50]
ldr r0, [r0, #4]
cmp r0, #0
beq _08023088
cmp r1, #8
beq _08023080
adds r0, r4, #0
bl sub_080235BC
b _08023090
_08023080:
adds r0, r4, #0
bl sub_08023730
b _08023090
_08023088:
adds r0, r4, #0
bl DeleteEntity
b _080230CA
_08023090:
ldr r0, [r4, #0x50]
adds r2, r0, #0
adds r2, #0x7c
adds r0, #0x7d
ldrb r1, [r2]
ldrb r0, [r0]
cmp r1, r0
beq _080230CA
ldr r1, [r4, #0x54]
cmp r1, #0
beq _080230CA
ldrb r2, [r2]
subs r2, #1
movs r0, #0xf
ands r2, r0
adds r2, #0x78
adds r2, r1, r2
ldrh r1, [r4, #0x2e]
subs r1, r1, r5
adds r1, #8
movs r3, #0xf
ands r1, r3
lsls r1, r1, #4
ldrh r0, [r4, #0x32]
subs r0, r0, r6
adds r0, #8
ands r0, r3
orrs r1, r0
strb r1, [r2]
_080230CA:
pop {r4, r5, r6, pc}
.syntax divided
asm/non_matching/moldworm/sub_080239F0.inc
+43
View File
@@ -0,0 +1,43 @@
.syntax unified
.text
adds r2, r0, #0
adds r1, r2, #0
adds r1, #0x78
movs r0, #0x88
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
adds r1, #1
strb r0, [r1]
bx lr
.syntax divided
asm/non_matching/moldworm/sub_08023B38.inc
+55
View File
@@ -0,0 +1,55 @@
.syntax unified
.text
push {r4, r5, r6, lr}
adds r4, r0, #0
movs r0, #1
bl sub_08049DF4
adds r5, r0, #0
cmp r5, #0
bne _08023B4C
movs r0, #0
b _08023B8E
_08023B4C:
movs r0, #0x2e
ldrsh r2, [r4, r0]
ldr r3, _08023B90 @ =gUnk_080CBCB8
ldrb r0, [r4, #0x14]
lsls r0, r0, #1
adds r1, r0, r3
ldrb r1, [r1]
lsls r1, r1, #0x18
asrs r1, r1, #0x18
adds r2, r2, r1
movs r6, #0x32
ldrsh r1, [r4, r6]
adds r0, #1
adds r0, r0, r3
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
adds r1, r1, r0
movs r3, #0
movs r4, #0x2e
ldrsh r0, [r5, r4]
subs r0, r0, r2
adds r0, #0x14
cmp r0, #0x28
bhi _08023B8C
movs r6, #0x32
ldrsh r0, [r5, r6]
subs r0, r0, r1
adds r0, #0x14
cmp r0, #0x28
bhi _08023B8C
movs r3, #1
_08023B8C:
adds r0, r3, #0
_08023B8E:
pop {r4, r5, r6, pc}
.align 2, 0
_08023B90: .4byte gUnk_080CBCB8
.syntax divided
asm/non_matching/pesto/sub_080249F4.inc
+24
View File
@@ -0,0 +1,24 @@
.syntax unified
.text
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0x15]
adds r1, r0, #2
movs r0, #0x1f
ands r1, r0
lsrs r1, r1, #2
ldrb r0, [r2, #0x14]
cmp r1, r0
beq _08024A12
strb r1, [r2, #0x14]
ldrb r1, [r2, #0x14]
adds r0, r2, #0
bl InitializeAnimation
_08024A12:
pop {pc}
.syntax divided
asm/non_matching/pesto/sub_08024C48.inc
+36
View File
@@ -0,0 +1,36 @@
.syntax unified
.text
push {r4, r5, lr}
adds r3, r0, #0
movs r4, #1
cmp r1, #0
beq _08024C60
movs r0, #3
bl sub_08049DF4
rsbs r1, r0, #0
orrs r1, r0
lsrs r4, r1, #0x1f
b _08024C78
_08024C60:
ldr r2, [r3, #0x54]
cmp r2, #0
beq _08024C74
ldr r0, [r2, #4]
cmp r0, #0
beq _08024C74
movs r5, #0x36
ldrsh r0, [r2, r5]
cmp r0, #0
bge _08024C78
_08024C74:
str r1, [r3, #0x54]
movs r4, #0
_08024C78:
adds r0, r4, #0
pop {r4, r5, pc}
.syntax divided
asm/non_matching/pesto/sub_08024E4C.inc
+133
View File
@@ -0,0 +1,133 @@
.syntax unified
.text
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
adds r0, #0x83
ldrb r0, [r0]
cmp r0, #3
bne _08024F46
ldrb r0, [r4, #0xf]
adds r0, #1
movs r7, #0
movs r1, #0xff
ands r0, r1
movs r1, #0x1f
ands r0, r1
strb r0, [r4, #0xf]
bl sub_0807953C
cmp r0, #0
beq _08024E84
bl Random
adds r3, r4, #0
adds r3, #0x84
ldrb r2, [r3]
adds r2, #1
movs r1, #1
ands r1, r0
adds r2, r2, r1
strb r2, [r3]
_08024E84:
ldr r0, _08024EC8 @ =gUnk_02002A40
adds r0, #0xaa
ldrb r0, [r0]
adds r2, r4, #0
adds r2, #0x87
cmp r0, #0
beq _08024E9A
adds r5, r2, #0
ldrb r0, [r5]
cmp r0, #4
bne _08024ECC
_08024E9A:
adds r1, r4, #0
adds r1, #0x84
movs r0, #0x30
strb r0, [r1]
strb r7, [r2]
adds r0, r4, #0
bl sub_08024F50
adds r0, r4, #0
adds r0, #0x80
strb r7, [r0]
movs r1, #0x40
movs r0, #0x40
strh r0, [r4, #0x24]
strb r1, [r4, #0xe]
movs r0, #8
strb r0, [r4, #0xf]
adds r0, r4, #0
movs r1, #0
movs r2, #8
bl sub_08024A14
b _08024F46
.align 2, 0
_08024EC8: .4byte gUnk_02002A40
_08024ECC:
ldr r6, _08024F48 @ =gPlayerEntity
bl ResetPlayer
ldr r2, _08024F4C @ =gPlayerState
ldr r0, [r2, #0x30]
movs r1, #0x80
lsls r1, r1, #1
orrs r0, r1
str r0, [r2, #0x30]
ldrb r0, [r2, #0xa]
movs r1, #0x80
orrs r0, r1
strb r0, [r2, #0xa]
movs r0, #0xe
strb r0, [r2, #0xc]
adds r1, r2, #0
adds r1, #0x38
movs r0, #0x14
strb r0, [r1]
adds r1, #1
movs r0, #1
strb r0, [r1]
adds r0, r2, #0
adds r0, #0x3a
strb r7, [r0]
movs r3, #0x80
lsls r3, r3, #9
adds r0, r4, #0
adds r1, r6, #0
movs r2, #0
bl PositionRelative
adds r1, r6, #0
adds r1, #0x63
movs r0, #0x1a
strb r0, [r1]
movs r0, #4
strb r0, [r6, #0x14]
adds r2, r6, #0
adds r2, #0x29
ldrb r1, [r2]
subs r0, #0x3d
ands r0, r1
strb r0, [r2]
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _08024F46
ldrb r0, [r5]
adds r0, #1
strb r0, [r5]
adds r1, r6, #0
adds r1, #0x3d
movs r0, #8
strb r0, [r1]
subs r0, #0xa
bl ModHealth
adds r0, r6, #0
movs r1, #0x7a
bl sub_0800449C
_08024F46:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08024F48: .4byte gPlayerEntity
_08024F4C: .4byte gPlayerState
.syntax divided
asm/non_matching/puffstool/sub_080258C4.inc
+77
View File
@@ -0,0 +1,77 @@
.syntax unified
.text
push {r4, lr}
adds r4, r0, #0
movs r0, #1
bl sub_08049DF4
adds r2, r0, #0
cmp r2, #0
beq _08025922
movs r0, #0x2e
ldrsh r1, [r2, r0]
movs r3, #0x2e
ldrsh r0, [r4, r3]
subs r3, r1, r0
adds r0, r3, #0
muls r0, r3, r0
adds r3, r0, #0
movs r1, #0x32
ldrsh r0, [r2, r1]
movs r2, #0x32
ldrsh r1, [r4, r2]
subs r0, r0, r1
adds r1, r0, #0
muls r1, r0, r1
adds r0, r1, #0
adds r3, r3, r0
adds r0, r4, #0
adds r0, #0x84
ldrh r0, [r0]
cmp r0, #0
bne _0802591A
adds r0, r4, #0
adds r0, #0x81
ldrb r1, [r0]
cmp r1, #0
bne _0802591A
movs r0, #0x80
lsls r0, r0, #3
cmp r3, r0
bgt _0802591A
movs r0, #9
strb r0, [r4, #0xc]
strb r1, [r4, #0xe]
b _08025942
_0802591A:
movs r0, #0x90
lsls r0, r0, #4
cmp r3, r0
ble _08025926
_08025922:
movs r0, #0
b _08025944
_08025926:
movs r0, #0xb
strb r0, [r4, #0xc]
movs r0, #1
strb r0, [r4, #0xe]
bl Random
ldr r2, _08025948 @ =gUnk_080CC050
movs r1, #0xf
ands r1, r0
adds r1, r1, r2
ldrb r1, [r1]
adds r0, r4, #0
adds r0, #0x78
strh r1, [r0]
_08025942:
movs r0, #1
_08025944:
pop {r4, pc}
.align 2, 0
_08025948: .4byte gUnk_080CC050
.syntax divided
asm/non_matching/puffstool/sub_0802594C.inc
+136
View File
@@ -0,0 +1,136 @@
.syntax unified
.text
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
sub sp, #0x14
mov sl, r0
ldr r0, _08025A20 @ =gUnk_080CC090
lsls r1, r1, #2
adds r1, r1, r0
ldr r7, [r1]
mov r0, sl
adds r0, #0x38
ldrb r0, [r0]
mov sb, r0
ldr r3, _08025A24 @ =gRoomControls
mov r1, sl
ldrh r0, [r1, #0x2e]
ldrh r1, [r3, #6]
subs r0, r0, r1
adds r0, #8
movs r1, #0x10
rsbs r1, r1, #0
adds r2, r1, #0
ands r0, r2
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
str r0, [sp]
mov r1, sl
ldrh r0, [r1, #0x32]
ldrh r1, [r3, #8]
subs r0, r0, r1
adds r0, #8
ands r0, r2
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
str r0, [sp, #4]
_08025996:
movs r0, #0
ldrsb r0, [r7, r0]
ldr r1, [sp]
lsls r4, r1, #0x10
asrs r4, r4, #0x10
adds r4, r4, r0
lsls r4, r4, #0x10
movs r0, #1
ldrsb r0, [r7, r0]
ldr r1, [sp, #4]
lsls r5, r1, #0x10
asrs r5, r5, #0x10
adds r5, r5, r0
lsls r5, r5, #0x10
lsrs r0, r4, #0x10
str r0, [sp, #8]
asrs r4, r4, #0x10
lsrs r1, r5, #0x10
str r1, [sp, #0xc]
asrs r5, r5, #0x10
adds r0, r4, #0
adds r1, r5, #0
mov r2, sb
bl sub_080002D4
adds r6, r0, #0
lsls r6, r6, #0x18
lsrs r6, r6, #0x18
movs r0, #0x10
rsbs r0, r0, #0
adds r0, r0, r4
mov r8, r0
adds r1, r5, #0
mov r2, sb
bl sub_080002D4
adds r3, r0, #0
lsls r3, r3, #0x18
lsrs r3, r3, #0x18
subs r5, #0x10
adds r0, r4, #0
adds r1, r5, #0
mov r2, sb
str r3, [sp, #0x10]
bl sub_080002D4
adds r4, r0, #0
lsls r4, r4, #0x18
lsrs r4, r4, #0x18
mov r0, r8
adds r1, r5, #0
mov r2, sb
bl sub_080002D4
ldr r3, [sp, #0x10]
orrs r6, r3
orrs r4, r6
orrs r4, r0
lsls r4, r4, #0x18
cmp r4, #0
beq _08025A28
adds r7, #2
movs r0, #0
ldrsb r0, [r7, r0]
cmp r0, #0x7f
bne _08025996
movs r0, #0
b _08025A44
.align 2, 0
_08025A20: .4byte gUnk_080CC090
_08025A24: .4byte gRoomControls
_08025A28:
ldr r2, _08025A50 @ =gRoomControls
ldrh r0, [r2, #6]
ldr r1, [sp, #8]
adds r0, r0, r1
mov r1, sl
adds r1, #0x7c
strh r0, [r1]
ldrh r0, [r2, #8]
ldr r1, [sp, #0xc]
adds r0, r0, r1
mov r1, sl
adds r1, #0x7e
strh r0, [r1]
movs r0, #1
_08025A44:
add sp, #0x14
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08025A50: .4byte gRoomControls
.syntax divided
asm/non_matching/sub_0804DE00.inc
+2 -2
View File
@@ -20,7 +20,7 @@ _0804DE22:
movs r0, #0x18
bl SetGlobalFlag
_0804DE32:
ldr r5, _0804DE50 @ =gUnk_080D4250
ldr r5, _0804DE50 @ =gAreaRoomEntities_HyruleTown
ldr r4, _0804DE54 @ =gUnk_02002A40
ldrb r0, [r4, #8]
lsls r0, r0, #2
@@ -35,7 +35,7 @@ _0804DE32:
str r0, [r1]
b _0804DECC
.align 2, 0
_0804DE50: .4byte gUnk_080D4250
_0804DE50: .4byte gAreaRoomEntities_HyruleTown
_0804DE54: .4byte gUnk_02002A40
_0804DE58: .4byte gUnk_02017654
_0804DE5C:
asm/npc23.s
+1 -1
View File
@@ -183,7 +183,7 @@ _08066410:
strb r0, [r4, #0xd]
_08066428:
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
_0806642E:
bl sub_08078B48
adds r0, r4, #0
asm/object20.s
+1 -1
View File
@@ -64,7 +64,7 @@ _08087836:
adds r0, r4, #0
bl sub_0801766C
movs r0, #0xfd
bl sub_08004488
bl EnqueueSFX
pop {r4, pc}
.align 2, 0
_08087884: .4byte gUnk_08120A54
asm/object24.s
+2 -2
View File
@@ -93,7 +93,7 @@ sub_0808886C: @ 0x0808886C
ldrh r0, [r0]
bl SetFlag
ldr r0, _080888B4 @ =0x0000016B
bl sub_08004488
bl EnqueueSFX
b _080888F2
.align 2, 0
_080888B4: .4byte 0x0000016B
@@ -117,7 +117,7 @@ _080888D2:
_080888DA:
movs r0, #0x86
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
b _080888F0
_080888E4:
cmp r4, r0
asm/object2A.s
+1 -1
View File
@@ -140,6 +140,6 @@ _08089C96:
bl InitializeAnimation
movs r0, #0x92
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_08089CBA:
pop {r4, r5, r6, pc}
asm/object35.s
+2 -2
View File
@@ -220,7 +220,7 @@ sub_0808B9D4: @ 0x0808B9D4
ldrb r2, [r2]
bl SetTile
ldr r0, _0808BA0C @ =0x0000010B
bl sub_08004488
bl EnqueueSFX
_0808BA0A:
pop {r4, pc}
.align 2, 0
@@ -294,7 +294,7 @@ sub_0808BA6C: @ 0x0808BA6C
movs r1, #2
bl sub_08083814
ldr r0, _0808BAA8 @ =0x0000010B
bl sub_08004488
bl EnqueueSFX
ldr r0, _0808BAAC @ =0x00004022
adds r1, r4, #0
adds r1, #0x76
asm/object43.s
+1 -1
View File
@@ -263,7 +263,7 @@ _0808E084:
_0808E0B8: .4byte gScreenTransition
_0808E0BC:
ldr r0, _0808E140 @ =0x00000115
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
movs r1, #0x12
movs r2, #0
asm/object44.s
+1 -1
View File
@@ -113,7 +113,7 @@ _0808E340:
cmp r0, #0
beq _0808E34E
ldr r0, _0808E350 @ =0x0000018B
bl sub_08004488
bl EnqueueSFX
_0808E34E:
pop {r4, pc}
.align 2, 0
asm/object64.s
+1 -1
View File
@@ -61,7 +61,7 @@ _08093E6A:
cmp r0, #0
bne _08093E90
ldrh r0, [r2]
bl sub_08004488
bl EnqueueSFX
_08093E90:
ldrb r1, [r4, #0xb]
movs r0, #0x20
asm/object6A.s
+2 -2
View File
@@ -637,7 +637,7 @@ _08094ED4:
bl InitializeAnimation
movs r0, #0xbf
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
b _08094F94
.align 2, 0
_08094F04: .4byte 0xFFFFE000
@@ -1992,7 +1992,7 @@ sub_08095954: @ 0x08095954
str r0, [r1]
movs r0, #0x92
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
adds r2, r5, #0
adds r2, #0x5a
ldrb r1, [r2]
asm/object87.s
+1 -1
View File
@@ -67,7 +67,7 @@ _08099F70:
bl InitializeAnimation
movs r0, #0x92
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
b _0809A1B6
_08099F82:
ldr r0, [r5, #0x50]
asm/object8B.s
+1 -1
View File
@@ -170,7 +170,7 @@ sub_0809B050: @ 0x0809B050
bl sub_0809B0B0
movs r0, #0x86
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_0809B0A2:
pop {r4, r5, pc}
.align 2, 0
asm/objectA0.s
+1 -1
View File
@@ -114,7 +114,7 @@ sub_0809F1B0: @ 0x0809F1B0
adds r1, r5, #0
bl PositionRelative
movs r0, #0xec
bl sub_08004488
bl EnqueueSFX
b _0809F21E
.align 2, 0
_0809F208: .4byte gUnk_08124684
asm/objectA8.s
+1 -1
View File
@@ -65,7 +65,7 @@ _0809FAE6:
bl sub_0805E3A0
movs r0, #0x9b
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_0809FB30:
pop {pc}
.align 2, 0
asm/objectBlockingStairs.s
+3 -3
View File
@@ -184,7 +184,7 @@ _08092FF2:
movs r1, #0x50
bl sub_0805E4E0
ldr r0, _0809303C @ =0x0000010F
bl sub_08004488
bl EnqueueSFX
adds r0, r6, #0
bl sub_08093248
b _080930E6
@@ -326,7 +326,7 @@ _08093104:
strb r0, [r4, #0x15]
strb r2, [r4, #0xe]
ldr r0, _08093164 @ =0x0000010F
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
bl sub_08093248
b _08093174
@@ -620,7 +620,7 @@ _0809334A:
adds r1, r5, #0
bl sub_08093308
movs r0, #0x72
bl sub_08004488
bl EnqueueSFX
pop {r4, r5, pc}
.align 2, 0
asm/objectD.s
+2 -2
View File
@@ -124,7 +124,7 @@ sub_080843F8: @ 0x080843F8
movs r2, #0
bl CreateFx
ldr r0, _08084424 @ =0x0000010D
bl sub_08004488
bl EnqueueSFX
_08084420:
pop {pc}
.align 2, 0
@@ -150,7 +150,7 @@ sub_08084428: @ 0x08084428
bl SetFlag
movs r0, #0x86
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_08084454:
pop {r4, pc}
.align 2, 0
asm/objectOnPillar.s
+2 -2
View File
@@ -360,7 +360,7 @@ sub_08097098: @ 0x08097098
movs r0, #0x20
strh r0, [r1]
adds r0, #0xef
bl sub_08004488
bl EnqueueSFX
adds r0, r6, #0
adds r0, #0x70
ldrh r0, [r0]
@@ -504,7 +504,7 @@ _080971B8:
ldrh r0, [r0]
bl SetFlag
ldr r0, _080971D8 @ =0x0000010B
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
bl sub_080971E0
movs r0, #1
asm/octorokBoss.s
+5 -5
View File
@@ -244,7 +244,7 @@ _08035356:
lsls r0, r0, #1
strh r0, [r5, #0x24]
adds r0, r5, #0
bl sub_080AEF88
bl ProcessMovement
adds r7, r5, #0
adds r7, #0x79
b _08035456
@@ -1952,7 +1952,7 @@ _080360A0:
b _080360BE
_080360B2:
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
cmp r0, #0
bne _080360BE
strb r0, [r5]
@@ -1991,7 +1991,7 @@ sub_080360E8: @ 0x080360E8
cmp r0, #0
bne _08036178
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
movs r2, #0
ldrb r0, [r4, #0x15]
cmp r0, #0
@@ -2884,7 +2884,7 @@ sub_08036764: @ 0x08036764
sub_080367B0: @ 0x080367B0
push {r4, r5, lr}
adds r4, r0, #0
bl sub_080AEF88
bl ProcessMovement
ldrh r0, [r4, #0x2a]
cmp r0, #0
beq _0803683A
@@ -3005,7 +3005,7 @@ sub_08036870: @ 0x08036870
strb r0, [r3, #0x15]
strh r2, [r3, #0x2a]
adds r0, r3, #0
bl sub_080AEF88
bl ProcessMovement
b _080368D4
_080368AA:
lsls r0, r1, #0x18
asm/octorokGolden.s
+2 -2
View File
@@ -135,7 +135,7 @@ _08037D26:
movs r1, #2
bl UpdateAnimationVariableFrames
adds r0, r4, #0
bl sub_080AEF88
bl ProcessMovement
cmp r0, #0
bne _08037D40
adds r0, r4, #0
@@ -201,7 +201,7 @@ sub_08037D54: @ 0x08037D54
strh r0, [r2, #0x36]
movs r0, #0x92
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
b _08037E0C
.align 2, 0
_08037DBC: .4byte gUnk_080CF490
asm/pesto.s
-2234
View File
File diff suppressed because it is too large Load Diff
asm/picoBloom.s
+1 -1
View File
@@ -84,7 +84,7 @@ sub_08098AE8: @ 0x08098AE8
ands r0, r1
strb r0, [r4]
ldr r0, _08098B0C @ =0x0000021B
bl sub_08004488
bl EnqueueSFX
_08098B08:
pop {r4, pc}
.align 2, 0
asm/puffstool.s
-1681
View File
File diff suppressed because it is too large Load Diff
asm/pullableLever.s
+3 -3
View File
@@ -296,7 +296,7 @@ _080913E0:
strb r5, [r1]
movs r0, #0xcf
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_0809142A:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -575,7 +575,7 @@ _080915E0:
bhi _08091640
movs r0, #0x86
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
adds r0, r5, #0
adds r0, #0x86
ldrh r0, [r0]
@@ -593,7 +593,7 @@ _08091640:
movs r0, #0x10
strb r0, [r5, #0xf]
adds r0, #0xff
bl sub_08004488
bl EnqueueSFX
_08091656:
add sp, #4
pop {r3, r4}
asm/pushableFurniture.s
+3 -3
View File
@@ -230,7 +230,7 @@ _0808FAF2:
bne _0808FB0A
movs r0, #0x86
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_0808FB0A:
ldrb r0, [r4, #0xa]
cmp r0, #2
@@ -271,7 +271,7 @@ _0808FB3E:
movs r0, #2
strb r0, [r4, #0xd]
movs r0, #0x80
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
bl sub_0808FF20
b _0808FB64
@@ -598,7 +598,7 @@ _0808FDB4:
strb r0, [r4, #0xe]
_0808FDB6:
ldr r0, _0808FDE0 @ =0x0000010F
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
bl sub_08090254
ldr r1, _0808FDE4 @ =gUnk_080B4488
asm/pushableGrave.s
+1 -1
View File
@@ -293,7 +293,7 @@ _080977BC:
b _080977E4
_080977C8:
movs r0, #0x72
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
bl sub_080977F4
ldrb r0, [r4, #0xa]
asm/pushableLever.s
+2 -2
View File
@@ -62,7 +62,7 @@ sub_08098294: @ 0x08098294
bl SetTile
movs r0, #0xb5
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
adds r0, r4, #0
movs r1, #0x1e
bl sub_0805E4E0
@@ -315,7 +315,7 @@ _08098492:
bne _080984C2
movs r0, #0x82
lsls r0, r0, #1
bl sub_08004488
bl EnqueueSFX
_080984C2:
pop {r4, pc}
.align 2, 0
asm/pushableRock.s
+1 -1
View File
@@ -114,7 +114,7 @@ _0808A598:
adds r0, r4, #0
bl InitializeAnimation
ldr r0, _0808A5C8 @ =0x0000010F
bl sub_08004488
bl EnqueueSFX
b _0808A5DE
.align 2, 0
_0808A5C8: .4byte 0x0000010F

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