mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-09 14:55:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

managerF: delete unused nonmatchings

Browse Source
This commit is contained in:
Ibot02
2021-09-29 10:28:12 +02:00
parent 81c8e7622f
commit f1447af6f8
9 changed files with 0 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matching/managerF/sub_08058EE4.inc
-45
View File
@@ -1,45 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
adds r6, r0, #0
ldrb r0, [r6, #0xc]
cmp r0, #0
bne _08058EF2
movs r0, #1
strb r0, [r6, #0xc]
_08058EF2:
ldrb r0, [r6, #0xb]
bl CheckRoomFlag
cmp r0, #0
beq _08058F40
movs r5, #0x94
lsls r5, r5, #1
ldrb r2, [r6, #0xb]
adds r2, #1
adds r0, r5, #0
movs r1, #0x68
bl sub_08058F44
movs r4, #0xac
lsls r4, r4, #1
ldrb r2, [r6, #0xb]
adds r2, #2
adds r0, r4, #0
movs r1, #0x68
bl sub_08058F44
ldrb r2, [r6, #0xb]
adds r2, #3
adds r0, r5, #0
movs r1, #0x98
bl sub_08058F44
ldrb r2, [r6, #0xb]
adds r2, #4
adds r0, r4, #0
movs r1, #0x98
bl sub_08058F44
movs r0, #0x92
lsls r0, r0, #1
bl SoundReq
bl DeleteThisEntity
_08058F40:
pop {r4, r5, r6, pc}
.align 2, 0
.syntax divided
asm/non_matching/managerF/sub_08058FB0.inc
-91
View File
@@ -1,91 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #1
beq _08058FF6
cmp r0, #1
bgt _08058FC4
cmp r0, #0
beq _08058FCA
b _08059050
_08058FC4:
cmp r0, #2
beq _08059018
b _08059050
_08058FCA:
movs r0, #1
strb r0, [r4, #0xc]
ldrb r0, [r4, #0xa]
cmp r0, #1
bne _08058FDC
movs r0, #7
strb r0, [r4, #0xd]
movs r0, #6
b _08058FE2
_08058FDC:
movs r0, #8
strb r0, [r4, #0xd]
movs r0, #2
_08058FE2:
strb r0, [r4, #0xf]
ldrh r0, [r4, #0x3e]
bl CheckFlags
cmp r0, #0
beq _08059060
adds r0, r4, #0
bl DeleteManager
b _08059060
_08058FF6:
ldrh r0, [r4, #0x3e]
bl CheckFlags
cmp r0, #0
beq _08059060
movs r0, #2
strb r0, [r4, #0xc]
movs r0, #0x78
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #0xf0
bl sub_0805E4E0
adds r0, r4, #0
bl sub_08059064
b _08059060
_08059018:
ldrb r0, [r4, #0xe]
cmp r0, #0x5a
bne _08059028
movs r0, #2
bl sub_08078A90
bl sub_08077B20
_08059028:
ldrb r2, [r4, #0xe]
cmp r2, #0x3c
bne _08059034
ldr r1, _0805904C @ =gPlayerEntity
ldrb r0, [r4, #0xf]
strb r0, [r1, #0x14]
_08059034:
subs r0, r2, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
cmp r0, #0
bne _08059060
movs r0, #3
strb r0, [r4, #0xc]
ldrb r1, [r4, #0xd]
movs r0, #5
bl MenuFadeIn
b _08059060
.align 2, 0
_0805904C: .4byte gPlayerEntity
_08059050:
ldrh r0, [r4, #0x3e]
bl SetFlag
movs r0, #1
bl sub_08078A90
bl DeleteThisEntity
_08059060:
pop {r4, pc}
.align 2, 0
.syntax divided
asm/non_matching/managerF/sub_08059124.inc
-80
View File
@@ -1,80 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #0
beq _08059174
cmp r0, #1
beq _080591AC
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
cmp r0, #0
bne _080591C8
movs r1, #0x38
ldrsh r0, [r4, r1]
movs r2, #0x3a
ldrsh r1, [r4, r2]
ldrb r2, [r4, #0xb]
bl CreateDustAt
ldrh r0, [r4, #0x38]
lsls r0, r0, #0x10
asrs r0, r0, #0x14
movs r2, #0x3f
ands r0, r2
ldrh r1, [r4, #0x3a]
lsls r1, r1, #0x10
asrs r1, r1, #0x14
ands r1, r2
lsls r1, r1, #6
orrs r0, r1
ldrb r1, [r4, #0xb]
bl sub_0807BA8C
movs r0, #0xcd
bl SoundReq
bl DeleteThisEntity
b _080591C8
_08059174:
ldrh r0, [r4, #0x3e]
bl CheckFlags
cmp r0, #0
beq _08059182
bl DeleteThisEntity
_08059182:
movs r0, #1
strb r0, [r4, #0xc]
ldr r0, _080591A8 @ =0x00000365
ldrh r1, [r4, #0x38]
lsls r1, r1, #0x10
asrs r1, r1, #0x14
movs r3, #0x3f
ands r1, r3
ldrh r2, [r4, #0x3a]
lsls r2, r2, #0x10
asrs r2, r2, #0x14
ands r2, r3
lsls r2, r2, #6
orrs r1, r2
ldrb r2, [r4, #0xb]
bl SetTileType
b _080591C8
.align 2, 0
_080591A8: .4byte 0x00000365
_080591AC:
ldrh r0, [r4, #0x3e]
bl CheckFlags
cmp r0, #0
beq _080591C8
adds r0, r4, #0
movs r1, #0x4b
bl sub_0805E4E0
movs r0, #0x2d
strb r0, [r4, #0xe]
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
_080591C8:
pop {r4, pc}
.align 2, 0
.syntax divided
asm/non_matching/managerF/sub_080591CC.inc
-44
View File
@@ -1,44 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #0
bne _080591F4
movs r0, #1
strb r0, [r4, #0xc]
ldrh r0, [r4, #0x3e]
bl CheckFlags
strb r0, [r4, #0xb]
lsls r0, r0, #0x18
cmp r0, #0
beq _08059214
ldr r1, _080591F0 @ =gRoomVars
ldrh r0, [r4, #0x3a]
b _08059218
.align 2, 0
_080591F0: .4byte gRoomVars
_080591F4:
ldrh r0, [r4, #0x3e]
bl CheckFlags
adds r1, r0, #0
ldrb r0, [r4, #0xb]
cmp r0, r1
beq _0805921A
strb r1, [r4, #0xb]
cmp r1, #0
beq _08059214
ldr r1, _08059210 @ =gRoomVars
ldrh r0, [r4, #0x3a]
b _08059218
.align 2, 0
_08059210: .4byte gRoomVars
_08059214:
ldr r1, _0805921C @ =gRoomVars
ldrh r0, [r4, #0x38]
_08059218:
strh r0, [r1, #0xc]
_0805921A:
pop {r4, pc}
.align 2, 0
_0805921C: .4byte gRoomVars
.syntax divided
asm/non_matching/managerF/sub_08059220.inc
-46
View File
@@ -1,46 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
ldr r2, _08059268 @ =gRoomVars
movs r0, #0
strh r0, [r2, #0xc]
ldr r4, _0805926C @ =gUnk_08108354
ldrh r0, [r4]
ldr r1, _08059270 @ =0x0000FFFF
cmp r0, r1
beq _08059254
adds r7, r2, #0
adds r6, r1, #0
_08059238:
ldrh r0, [r4]
ldrh r1, [r4, #2]
ldrh r2, [r4, #4]
ldrh r3, [r4, #6]
bl CheckPlayerInRegion
cmp r0, #0
beq _0805924C
ldrh r0, [r4, #8]
strh r0, [r7, #0xc]
_0805924C:
adds r4, #0xa
ldrh r0, [r4]
cmp r0, r6
bne _08059238
_08059254:
ldrb r0, [r5, #0xc]
cmp r0, #0
bne _08059266
movs r0, #1
strb r0, [r5, #0xc]
ldr r1, _08059274 @ =gArea
ldr r0, _08059268 @ =gRoomVars
ldrh r0, [r0, #0xc]
strh r0, [r1, #0xa]
_08059266:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08059268: .4byte gRoomVars
_0805926C: .4byte gUnk_08108354
_08059270: .4byte 0x0000FFFF
_08059274: .4byte gArea
.syntax divided
asm/non_matching/managerF/sub_080593CC.inc
-45
View File
@@ -1,45 +0,0 @@
.syntax unified
push {r4, lr}
adds r3, r0, #0
ldr r2, _08059418 @ =gPlayerState
ldr r0, [r2, #0x30]
movs r1, #0x80
ands r0, r1
cmp r0, #0
bne _08059420
adds r0, r2, #0
adds r0, #0x26
ldrb r0, [r0]
cmp r0, #0
beq _08059420
ldr r4, _0805941C @ =gPlayerEntity
ldrb r0, [r4, #0x14]
cmp r0, #0
bne _08059420
adds r0, r2, #0
adds r0, #0x90
ldrh r1, [r0]
movs r0, #0xf0
lsls r0, r0, #4
ands r0, r1
movs r1, #0x80
lsls r1, r1, #3
cmp r0, r1
bne _08059420
movs r0, #0x38
ldrsh r1, [r3, r0]
movs r0, #0x3a
ldrsh r2, [r3, r0]
adds r2, #0xc
adds r0, r4, #0
movs r3, #6
bl sub_0806FCB8
b _08059422
.align 2, 0
_08059418: .4byte gPlayerState
_0805941C: .4byte gPlayerEntity
_08059420:
movs r0, #0
_08059422:
pop {r4, pc}
.syntax divided
asm/non_matching/managerF/sub_0805947C.inc
-44
View File
@@ -1,44 +0,0 @@
.syntax unified
push {lr}
ldrh r0, [r0, #0x3e]
bl CheckFlags
cmp r0, #0
bne _080594CE
movs r0, #3
bl sub_08078A90
ldr r1, _080594B0 @ =gRoomControls
ldrh r0, [r1]
cmp r0, #0
bne _080594D2
ldr r0, _080594B4 @ =gRoomVars
ldrb r0, [r0]
cmp r0, #0
beq _080594BC
ldr r0, _080594B8 @ =gUnk_08108380
ldrb r1, [r1, #0x10]
lsls r1, r1, #2
adds r1, r1, r0
ldr r0, [r1]
bl StartPlayerScript
b _080594CE
.align 2, 0
_080594B0: .4byte gRoomControls
_080594B4: .4byte gRoomVars
_080594B8: .4byte gUnk_08108380
_080594BC:
ldr r1, _080594D4 @ =gUnk_08108380
ldr r0, _080594D8 @ =gPlayerEntity
ldrb r0, [r0, #0x14]
lsrs r0, r0, #1
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl StartPlayerScript
_080594CE:
bl DeleteThisEntity
_080594D2:
pop {pc}
.align 2, 0
_080594D4: .4byte gUnk_08108380
_080594D8: .4byte gPlayerEntity
.syntax divided
asm/non_matching/managerF/sub_080594DC.inc
-51
View File
@@ -1,51 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #1
beq _080594F2
cmp r0, #1
bgt _0805951C
cmp r0, #0
bne _0805951C
movs r0, #1
strb r0, [r4, #0xc]
_080594F2:
movs r0, #6
bl GetInventoryValue
cmp r0, #0
beq _08059540
movs r0, #0x8c
lsls r0, r0, #4
movs r1, #0x85
bl CheckLocalFlagByOffset
cmp r0, #0
bne _08059540
movs r0, #2
strb r0, [r4, #0xc]
ldr r0, _08059518 @ =0x00000B0F
bl sub_080186C0
b _08059540
.align 2, 0
_08059518: .4byte 0x00000B0F
_0805951C:
ldr r0, _08059544 @ =gArea
adds r0, #0x28
ldrb r0, [r0]
cmp r0, #0xff
beq _0805952A
bl DeleteThisEntity
_0805952A:
movs r0, #0x8c
lsls r0, r0, #4
movs r1, #0x85
bl CheckLocalFlagByOffset
cmp r0, #0
beq _08059540
bl sub_0801855C
bl DeleteThisEntity
_08059540:
pop {r4, pc}
.align 2, 0
_08059544: .4byte gArea
.syntax divided
asm/non_matching/managerF/sub_08059548.inc
-43
View File
@@ -1,43 +0,0 @@
.syntax unified
.ifdef USA
push {lr}
movs r1, #6
bl sub_0805E3A0
ldr r0, _08059568 @ =gPlayerEntity
ldrb r0, [r0, #0xc]
cmp r0, #0x16
bne _0805955C
bl DeleteThisEntity
_0805955C:
ldr r2, _0805956C @ =gInput
ldrh r1, [r2]
movs r0, #4
orrs r0, r1
strh r0, [r2]
pop {pc}
.align 2, 0
_08059568: .4byte gPlayerEntity
_0805956C: .4byte gInput
.else
.ifdef DEMO @ TODO deduplicate
push {lr}
movs r1, #6
bl sub_0805E3A0
ldr r0, _08059568 @ =gPlayerEntity
ldrb r0, [r0, #0xc]
cmp r0, #0x16
bne _0805955C
bl DeleteThisEntity
_0805955C:
ldr r2, _0805956C @ =gInput
ldrh r1, [r2]
movs r0, #4
orrs r0, r1
strh r0, [r2]
pop {pc}
.align 2, 0
_08059568: .4byte gPlayerEntity
_0805956C: .4byte gInput
.endif
.endif
.syntax divided