mirror of
https://github.com/zeldaret/tmc
synced 2026-09-04 02:29:33 -04:00
Merge branch 'master' into manager8
This commit is contained in:
notyourav
-256
@@ -1,256 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_08057AD0
|
||||
sub_08057AD0: @ 0x08057AD0
|
||||
push {lr}
|
||||
ldr r2, _08057AE4 @ =gUnk_08108044
|
||||
ldrb r1, [r0, #0xc]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r2
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_08057AE4: .4byte gUnk_08108044
|
||||
|
||||
thumb_func_start sub_08057AE8
|
||||
sub_08057AE8: @ 0x08057AE8
|
||||
push {r4, r5, lr}
|
||||
adds r5, r0, #0
|
||||
ldrb r0, [r5, #0xb]
|
||||
movs r1, #3
|
||||
ands r1, r0
|
||||
lsls r1, r1, #1
|
||||
ldrb r0, [r5, #0xe]
|
||||
cmp r0, #1
|
||||
bne _08057B04
|
||||
ldr r0, _08057B00 @ =0x00000323
|
||||
strh r0, [r5, #0x30]
|
||||
b _08057B12
|
||||
.align 2, 0
|
||||
_08057B00: .4byte 0x00000323
|
||||
_08057B04:
|
||||
movs r0, #2
|
||||
ands r0, r1
|
||||
movs r2, #0x36
|
||||
cmp r0, #0
|
||||
beq _08057B10
|
||||
movs r2, #0x37
|
||||
_08057B10:
|
||||
strh r2, [r5, #0x30]
|
||||
_08057B12:
|
||||
ldr r2, _08057B9C @ =gUnk_08108024
|
||||
lsls r3, r1, #1
|
||||
adds r0, r3, r2
|
||||
ldrh r0, [r0]
|
||||
movs r4, #0
|
||||
strh r0, [r5, #0x28]
|
||||
adds r1, #1
|
||||
lsls r1, r1, #1
|
||||
adds r2, r1, r2
|
||||
ldrh r0, [r2]
|
||||
strh r0, [r5, #0x2a]
|
||||
ldr r2, _08057BA0 @ =gUnk_08108034
|
||||
adds r3, r3, r2
|
||||
ldrh r0, [r3]
|
||||
strh r0, [r5, #0x2c]
|
||||
adds r1, r1, r2
|
||||
ldrh r0, [r1]
|
||||
strh r0, [r5, #0x2e]
|
||||
ldrb r2, [r5, #0xb]
|
||||
lsrs r0, r2, #2
|
||||
movs r1, #0xf
|
||||
ands r0, r1
|
||||
adds r0, #1
|
||||
strh r0, [r5, #0x32]
|
||||
movs r0, #0x1c
|
||||
strb r0, [r5, #0xe]
|
||||
strb r4, [r5, #0xf]
|
||||
movs r0, #0x80
|
||||
ands r0, r2
|
||||
movs r1, #1
|
||||
cmp r0, #0
|
||||
beq _08057B54
|
||||
movs r1, #2
|
||||
_08057B54:
|
||||
strb r1, [r5, #0xc]
|
||||
cmp r1, #2
|
||||
bne _08057B9A
|
||||
ldrh r0, [r5, #0x3e]
|
||||
bl CheckFlags
|
||||
cmp r0, #0
|
||||
beq _08057B9A
|
||||
ldrh r0, [r5, #0x32]
|
||||
cmp r0, #0
|
||||
beq _08057B94
|
||||
_08057B6A:
|
||||
ldrh r1, [r5, #0x28]
|
||||
ldrh r2, [r5, #0x2a]
|
||||
adds r0, r5, #0
|
||||
bl sub_08057CA4
|
||||
ldrh r0, [r5, #0x30]
|
||||
movs r2, #0x38
|
||||
ldrsh r1, [r5, r2]
|
||||
movs r3, #0x3a
|
||||
ldrsh r2, [r5, r3]
|
||||
lsls r2, r2, #6
|
||||
orrs r1, r2
|
||||
ldrh r2, [r5, #0x3c]
|
||||
bl sub_0807B7D8
|
||||
ldrh r0, [r5, #0x32]
|
||||
subs r0, #1
|
||||
strh r0, [r5, #0x32]
|
||||
lsls r0, r0, #0x10
|
||||
cmp r0, #0
|
||||
bne _08057B6A
|
||||
_08057B94:
|
||||
adds r0, r5, #0
|
||||
bl DeleteManager
|
||||
_08057B9A:
|
||||
pop {r4, r5, pc}
|
||||
.align 2, 0
|
||||
_08057B9C: .4byte gUnk_08108024
|
||||
_08057BA0: .4byte gUnk_08108034
|
||||
|
||||
thumb_func_start sub_08057BA4
|
||||
sub_08057BA4: @ 0x08057BA4
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xe]
|
||||
subs r0, #1
|
||||
strb r0, [r4, #0xe]
|
||||
lsls r0, r0, #0x18
|
||||
cmp r0, #0
|
||||
bne _08057C24
|
||||
movs r0, #8
|
||||
strb r0, [r4, #0xe]
|
||||
ldrh r0, [r4, #0x3e]
|
||||
bl CheckFlags
|
||||
cmp r0, #0
|
||||
beq _08057BF6
|
||||
ldrh r0, [r4, #0x32]
|
||||
ldrb r1, [r4, #0xf]
|
||||
cmp r0, r1
|
||||
beq _08057C24
|
||||
ldrh r1, [r4, #0x28]
|
||||
ldrh r2, [r4, #0x2a]
|
||||
adds r0, r4, #0
|
||||
bl sub_08057CA4
|
||||
ldrh r0, [r4, #0x30]
|
||||
movs r2, #0x38
|
||||
ldrsh r1, [r4, r2]
|
||||
movs r3, #0x3a
|
||||
ldrsh r2, [r4, r3]
|
||||
lsls r2, r2, #6
|
||||
orrs r1, r2
|
||||
ldrh r2, [r4, #0x3c]
|
||||
bl sub_0807B7D8
|
||||
ldrb r0, [r4, #0xf]
|
||||
adds r0, #1
|
||||
strb r0, [r4, #0xf]
|
||||
movs r0, #0x71
|
||||
bl PlaySFX
|
||||
b _08057C24
|
||||
_08057BF6:
|
||||
ldrb r0, [r4, #0xf]
|
||||
cmp r0, #0
|
||||
beq _08057C24
|
||||
movs r1, #0x38
|
||||
ldrsh r0, [r4, r1]
|
||||
movs r2, #0x3a
|
||||
ldrsh r1, [r4, r2]
|
||||
lsls r1, r1, #6
|
||||
orrs r0, r1
|
||||
ldrh r1, [r4, #0x3c]
|
||||
bl sub_0807BA8C
|
||||
ldrh r1, [r4, #0x2c]
|
||||
ldrh r2, [r4, #0x2e]
|
||||
adds r0, r4, #0
|
||||
bl sub_08057CA4
|
||||
ldrb r0, [r4, #0xf]
|
||||
subs r0, #1
|
||||
strb r0, [r4, #0xf]
|
||||
movs r0, #0x71
|
||||
bl PlaySFX
|
||||
_08057C24:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_08057C28
|
||||
sub_08057C28: @ 0x08057C28
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xd]
|
||||
cmp r0, #0
|
||||
bne _08057C44
|
||||
ldrh r0, [r4, #0x3e]
|
||||
bl CheckFlags
|
||||
cmp r0, #0
|
||||
beq _08057C9C
|
||||
ldrb r0, [r4, #0xd]
|
||||
adds r0, #1
|
||||
strb r0, [r4, #0xd]
|
||||
b _08057C9C
|
||||
_08057C44:
|
||||
ldrb r0, [r4, #0xe]
|
||||
subs r0, #1
|
||||
strb r0, [r4, #0xe]
|
||||
lsls r0, r0, #0x18
|
||||
cmp r0, #0
|
||||
bne _08057C9C
|
||||
movs r0, #8
|
||||
strb r0, [r4, #0xe]
|
||||
ldrh r0, [r4, #0x32]
|
||||
ldrb r1, [r4, #0xf]
|
||||
cmp r0, r1
|
||||
beq _08057C88
|
||||
ldrh r1, [r4, #0x28]
|
||||
ldrh r2, [r4, #0x2a]
|
||||
adds r0, r4, #0
|
||||
bl sub_08057CA4
|
||||
ldrh r0, [r4, #0x30]
|
||||
movs r2, #0x38
|
||||
ldrsh r1, [r4, r2]
|
||||
movs r3, #0x3a
|
||||
ldrsh r2, [r4, r3]
|
||||
lsls r2, r2, #6
|
||||
orrs r1, r2
|
||||
ldrh r2, [r4, #0x3c]
|
||||
bl sub_0807B7D8
|
||||
ldrb r0, [r4, #0xf]
|
||||
adds r0, #1
|
||||
strb r0, [r4, #0xf]
|
||||
movs r0, #0x71
|
||||
bl PlaySFX
|
||||
b _08057C9C
|
||||
_08057C88:
|
||||
ldrh r1, [r4, #0x30]
|
||||
ldr r0, _08057CA0 @ =0x00000323
|
||||
cmp r1, r0
|
||||
beq _08057C96
|
||||
movs r0, #0x72
|
||||
bl PlaySFX
|
||||
_08057C96:
|
||||
adds r0, r4, #0
|
||||
bl DeleteManager
|
||||
_08057C9C:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_08057CA0: .4byte 0x00000323
|
||||
|
||||
thumb_func_start sub_08057CA4
|
||||
sub_08057CA4: @ 0x08057CA4
|
||||
ldrh r3, [r0, #0x38]
|
||||
adds r3, r3, r1
|
||||
strh r3, [r0, #0x38]
|
||||
ldrh r1, [r0, #0x3a]
|
||||
adds r1, r1, r2
|
||||
strh r1, [r0, #0x3a]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
-202
@@ -1,202 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_08057D50
|
||||
sub_08057D50: @ 0x08057D50
|
||||
push {r4, r5, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xc]
|
||||
cmp r0, #0
|
||||
bne _08057D7C
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
movs r0, #8
|
||||
strb r0, [r4, #0xe]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x20
|
||||
movs r0, #0xff
|
||||
strb r0, [r1]
|
||||
adds r0, r4, #0
|
||||
movs r1, #6
|
||||
bl sub_0805E3A0
|
||||
ldr r1, _08057DC0 @ =sub_08057E30
|
||||
adds r0, r4, #0
|
||||
movs r2, #0
|
||||
bl sub_08052D74
|
||||
_08057D7C:
|
||||
adds r0, r4, #0
|
||||
bl sub_08057E40
|
||||
cmp r0, #0
|
||||
beq _08057D9A
|
||||
ldr r0, _08057DC4 @ =gRoomVars
|
||||
ldrb r5, [r0, #0x10]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x20
|
||||
ldrb r0, [r1]
|
||||
cmp r0, r5
|
||||
beq _08057D9A
|
||||
movs r0, #0
|
||||
strb r5, [r1]
|
||||
strb r0, [r4, #0xe]
|
||||
_08057D9A:
|
||||
ldr r0, _08057DC8 @ =gRoomControls
|
||||
ldrh r3, [r0]
|
||||
cmp r3, #0
|
||||
bne _08057E2A
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x20
|
||||
ldrb r5, [r0]
|
||||
lsls r1, r5, #6
|
||||
ldr r0, _08057DCC @ =gUnk_081080A4
|
||||
adds r2, r1, r0
|
||||
ldrb r1, [r4, #0xe]
|
||||
cmp r1, #7
|
||||
bgt _08057DD0
|
||||
cmp r1, #1
|
||||
bge _08057E04
|
||||
cmp r1, #0
|
||||
beq _08057DD6
|
||||
b _08057E2A
|
||||
.align 2, 0
|
||||
_08057DC0: .4byte sub_08057E30
|
||||
_08057DC4: .4byte gRoomVars
|
||||
_08057DC8: .4byte gRoomControls
|
||||
_08057DCC: .4byte gUnk_081080A4
|
||||
_08057DD0:
|
||||
cmp r1, #8
|
||||
beq _08057E20
|
||||
b _08057E2A
|
||||
_08057DD6:
|
||||
ldr r1, _08057DF8 @ =gUnk_02034490
|
||||
movs r0, #1
|
||||
strb r0, [r1]
|
||||
ldr r0, [r2]
|
||||
ldr r1, _08057DFC @ =gGlobalGfxAndPalettes
|
||||
adds r0, r0, r1
|
||||
ldr r1, [r2, #4]
|
||||
movs r2, #0x80
|
||||
lsls r2, r2, #5
|
||||
bl LoadAssetAsync
|
||||
ldr r0, _08057E00 @ =gUnk_081081E4
|
||||
adds r0, r5, r0
|
||||
ldrb r0, [r0]
|
||||
bl LoadPaletteGroup
|
||||
b _08057E24
|
||||
.align 2, 0
|
||||
_08057DF8: .4byte gUnk_02034490
|
||||
_08057DFC: .4byte gGlobalGfxAndPalettes
|
||||
_08057E00: .4byte gUnk_081081E4
|
||||
_08057E04:
|
||||
lsls r1, r1, #3
|
||||
adds r1, r1, r2
|
||||
ldr r0, [r1]
|
||||
ldr r2, _08057E1C @ =gGlobalGfxAndPalettes
|
||||
adds r0, r0, r2
|
||||
ldr r1, [r1, #4]
|
||||
movs r2, #0x80
|
||||
lsls r2, r2, #5
|
||||
bl LoadAssetAsync
|
||||
b _08057E24
|
||||
.align 2, 0
|
||||
_08057E1C: .4byte gGlobalGfxAndPalettes
|
||||
_08057E20:
|
||||
ldr r0, _08057E2C @ =gUnk_02034490
|
||||
strb r3, [r0]
|
||||
_08057E24:
|
||||
ldrb r0, [r4, #0xe]
|
||||
adds r0, #1
|
||||
strb r0, [r4, #0xe]
|
||||
_08057E2A:
|
||||
pop {r4, r5, pc}
|
||||
.align 2, 0
|
||||
_08057E2C: .4byte gUnk_02034490
|
||||
|
||||
thumb_func_start sub_08057E30
|
||||
sub_08057E30: @ 0x08057E30
|
||||
push {lr}
|
||||
ldr r0, _08057E3C @ =gRoomVars
|
||||
ldrb r0, [r0, #0x10]
|
||||
bl sub_08057E7C
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_08057E3C: .4byte gRoomVars
|
||||
|
||||
thumb_func_start sub_08057E40
|
||||
sub_08057E40: @ 0x08057E40
|
||||
push {lr}
|
||||
ldr r0, _08057E54 @ =gUnk_08108050
|
||||
bl sub_08056300
|
||||
adds r1, r0, #0
|
||||
cmp r1, #0xff
|
||||
bne _08057E58
|
||||
movs r0, #0
|
||||
b _08057E5E
|
||||
.align 2, 0
|
||||
_08057E54: .4byte gUnk_08108050
|
||||
_08057E58:
|
||||
ldr r0, _08057E60 @ =gRoomVars
|
||||
strb r1, [r0, #0x10]
|
||||
movs r0, #1
|
||||
_08057E5E:
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_08057E60: .4byte gRoomVars
|
||||
|
||||
thumb_func_start sub_08057E64
|
||||
sub_08057E64: @ 0x08057E64
|
||||
push {lr}
|
||||
ldr r0, _08057E78 @ =gUnk_08108050
|
||||
bl sub_08056300
|
||||
cmp r0, #0xff
|
||||
beq _08057E74
|
||||
bl sub_08057E7C
|
||||
_08057E74:
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_08057E78: .4byte gUnk_08108050
|
||||
|
||||
thumb_func_start sub_08057E7C
|
||||
sub_08057E7C: @ 0x08057E7C
|
||||
push {r4, r5, r6, lr}
|
||||
adds r4, r0, #0
|
||||
cmp r4, #4
|
||||
bhi _08057EB6
|
||||
ldr r0, _08057EB8 @ =gUnk_081081E4
|
||||
adds r0, r4, r0
|
||||
ldrb r0, [r0]
|
||||
bl LoadPaletteGroup
|
||||
lsls r1, r4, #6
|
||||
ldr r0, _08057EBC @ =gUnk_081080A4
|
||||
adds r1, r1, r0
|
||||
movs r3, #0
|
||||
ldr r2, _08057EC0 @ =0x040000D4
|
||||
ldr r6, _08057EC4 @ =gGlobalGfxAndPalettes
|
||||
ldr r5, _08057EC8 @ =0x84000400
|
||||
_08057E9C:
|
||||
ldr r0, [r1]
|
||||
adds r0, r0, r6
|
||||
str r0, [r2]
|
||||
ldr r0, [r1, #4]
|
||||
str r0, [r2, #4]
|
||||
str r5, [r2, #8]
|
||||
ldr r0, [r2, #8]
|
||||
adds r3, #1
|
||||
adds r1, #8
|
||||
cmp r3, #7
|
||||
bls _08057E9C
|
||||
ldr r0, _08057ECC @ =gRoomVars
|
||||
strb r4, [r0, #0x10]
|
||||
_08057EB6:
|
||||
pop {r4, r5, r6, pc}
|
||||
.align 2, 0
|
||||
_08057EB8: .4byte gUnk_081081E4
|
||||
_08057EBC: .4byte gUnk_081080A4
|
||||
_08057EC0: .4byte 0x040000D4
|
||||
_08057EC4: .4byte gGlobalGfxAndPalettes
|
||||
_08057EC8: .4byte 0x84000400
|
||||
_08057ECC: .4byte gRoomVars
|
||||
Reference in New Issue
Block a user