util files

This commit is contained in:
theo3
2021-12-19 17:57:42 -08:00
parent 227703e496
commit 3c4e1762d9
23 changed files with 1077 additions and 2129 deletions
-36
View File
@@ -1,36 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0806EC20
sub_0806EC20: @ 0x0806EC20
push {r4, lr}
adds r4, r0, #0
movs r0, #0x58
movs r1, #0
movs r2, #0
bl CreateNPC
cmp r0, #0
beq _0806EC34
str r4, [r0, #0x50]
_0806EC34:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0806EC38
sub_0806EC38: @ 0x0806EC38
push {lr}
movs r0, #7
movs r1, #0x58
movs r2, #7
bl FindEntityByID
cmp r0, #0
beq _0806EC4C
bl DeleteEntity
_0806EC4C:
pop {pc}
.align 2, 0
-1749
View File
File diff suppressed because it is too large Load Diff
-197
View File
@@ -1,197 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start CreateItemEntity
CreateItemEntity: @ 0x080A7C00
push {r4, lr}
bl GiveItemWithCutscene
adds r4, r0, #0
cmp r4, #0
beq _080A7C16
ldrb r1, [r4, #0xa]
movs r2, #0
bl sub_080A276C
str r0, [r4, #0x50]
_080A7C16:
pop {r4, pc}
thumb_func_start sub_080A7C18
sub_080A7C18: @ 0x080A7C18
push {lr}
bl GiveItemWithCutscene
adds r2, r0, #0
cmp r2, #0
beq _080A7C32
ldr r0, _080A7C34 @ =gPlayerEntity
str r0, [r2, #0x50]
ldrb r1, [r2, #0xa]
adds r0, r2, #0
movs r2, #0
bl sub_08078AF0
_080A7C32:
pop {pc}
.align 2, 0
_080A7C34: .4byte gPlayerEntity
thumb_func_start GiveItemWithCutscene
GiveItemWithCutscene: @ 0x080A7C38
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
adds r6, r1, #0
adds r7, r2, #0
cmp r5, #0x3f
bne _080A7C52
ldr r0, _080A7C78 @ =gSave
adds r0, #0xbb
ldrb r0, [r0]
cmp r0, #0
beq _080A7C52
movs r5, #0x57
movs r6, #0
_080A7C52:
bl sub_0805E744
adds r4, r0, #0
cmp r4, #0
beq _080A7C72
strb r5, [r4, #0xa]
strb r6, [r4, #0xb]
strb r7, [r4, #0xe]
movs r0, #0xb
strb r0, [r4, #9]
movs r0, #6
strb r0, [r4, #8]
adds r0, r4, #0
movs r1, #6
bl AppendEntityToList
_080A7C72:
adds r0, r4, #0
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A7C78: .4byte gSave
thumb_func_start sub_080A7C7C
sub_080A7C7C: @ 0x080A7C7C
push {lr}
ldr r0, _080A7C88 @ =gUnk_02017660
movs r1, #0x40
bl MemClear
pop {pc}
.align 2, 0
_080A7C88: .4byte gUnk_02017660
thumb_func_start sub_080A7C8C
sub_080A7C8C: @ 0x080A7C8C
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r6, r1, #0
ldr r4, _080A7C9C @ =gUnk_02017660
movs r2, #0
movs r1, #0
b _080A7CA8
.align 2, 0
_080A7C9C: .4byte gUnk_02017660
_080A7CA0:
adds r1, #1
adds r4, #8
cmp r1, #7
bhi _080A7CB0
_080A7CA8:
ldrh r0, [r4, #4]
cmp r0, r5
bne _080A7CA0
movs r2, #1
_080A7CB0:
lsrs r1, r6, #1
ldrb r0, [r4, #6]
lsls r0, r0, #0x1f
lsrs r0, r0, #0x1f
cmp r1, r0
bne _080A7CF4
cmp r2, #0
beq _080A7CD2
ldrb r0, [r4, #1]
bl SetLocalFlag
ldrb r0, [r4, #2]
ldrb r1, [r4, #3]
movs r2, #0
bl CreateItemEntity
b _080A7CDC
_080A7CD2:
movs r0, #0x60
movs r1, #0
movs r2, #0
bl CreateItemEntity
_080A7CDC:
movs r0, #0x74
adds r1, r5, #0
adds r2, r6, #0
bl sub_0807B7D8
movs r0, #0
movs r1, #0x78
bl RequestPriorityDuration
ldr r0, _080A7CF8 @ =0x0000011B
bl SoundReq
_080A7CF4:
pop {r4, r5, r6, pc}
.align 2, 0
_080A7CF8: .4byte 0x0000011B
thumb_func_start sub_080A7CFC
sub_080A7CFC: @ 0x080A7CFC
push {r4, r5, r6, lr}
adds r5, r0, #0
movs r4, #0xc0
lsls r4, r4, #3
movs r6, #0
movs r0, #3
bl GetCurrentRoomProperty
adds r1, r0, #0
cmp r1, #0
beq _080A7D38
_080A7D12:
ldrh r0, [r1, #4]
cmp r0, r5
bne _080A7D30
ldrb r0, [r1]
cmp r0, #5
beq _080A7D24
cmp r0, #6
beq _080A7D2A
b _080A7D38
_080A7D24:
movs r6, #0
ldrh r4, [r1, #6]
b _080A7D38
_080A7D2A:
movs r6, #1
ldrh r4, [r1, #6]
b _080A7D38
_080A7D30:
adds r1, #8
ldrh r0, [r1, #4]
cmp r0, #0
bne _080A7D12
_080A7D38:
adds r0, r4, #0
adds r1, r6, #0
bl sub_080A7D44
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_start sub_080A7D44
sub_080A7D44: @ 0x080A7D44
push {lr}
cmp r1, #0
beq _080A7D52
movs r1, #0
bl sub_08078AA8
b _080A7D56
_080A7D52:
bl MessageFromTarget
_080A7D56:
pop {pc}
+216
View File
@@ -0,0 +1,216 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
mov r8, r0
adds r6, r1, #0
ldrh r1, [r6, #2]
asrs r7, r1, #4
movs r0, #1
ands r7, r0
movs r0, #0xf
ands r1, r0
cmp r1, #6
bls _0806F1C8
b _0806F332
_0806F1C8:
lsls r0, r1, #2
ldr r1, _0806F1D4 @ =_0806F1D8
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0806F1D4: .4byte _0806F1D8
_0806F1D8: @ jump table
.4byte _0806F332 @ case 0
.4byte _0806F342 @ case 1
.4byte _0806F1F4 @ case 2
.4byte _0806F24E @ case 3
.4byte _0806F2BA @ case 4
.4byte _0806F324 @ case 5
.4byte _0806F336 @ case 6
_0806F1F4:
ldr r4, [r6]
asrs r1, r4, #0xc
movs r0, #0xf
ands r1, r0
ldr r0, _0806F210 @ =0x00000FFF
ands r4, r0
movs r5, #0
cmp r1, #1
beq _0806F22A
cmp r1, #1
bgt _0806F214
cmp r1, #0
beq _0806F21A
b _0806F248
.align 2, 0
_0806F210: .4byte 0x00000FFF
_0806F214:
cmp r1, #2
beq _0806F23A
b _0806F248
_0806F21A:
adds r0, r4, #0
bl CheckRoomFlag
adds r5, r0, #0
_0806F222:
adds r0, r4, #0
bl SetRoomFlag
b _0806F248
_0806F22A:
adds r0, r4, #0
bl CheckLocalFlag
adds r5, r0, #0
_0806F232:
adds r0, r4, #0
bl SetLocalFlag
b _0806F248
_0806F23A:
adds r0, r4, #0
bl CheckGlobalFlag
adds r5, r0, #0
adds r0, r4, #0
bl SetGlobalFlag
_0806F248:
cmp r5, #0
beq _0806F342
b _0806F34C
_0806F24E:
ldr r4, [r6]
asrs r1, r4, #0xc
movs r0, #0xf
ands r1, r0
ldr r0, _0806F26C @ =0x00000FFF
ands r4, r0
movs r5, #0
cmp r1, #1
beq _0806F28A
cmp r1, #1
bgt _0806F270
cmp r1, #0
beq _0806F276
b _0806F248
.align 2, 0
_0806F26C: .4byte 0x00000FFF
_0806F270:
cmp r1, #2
beq _0806F29E
b _0806F248
_0806F276:
adds r0, r4, #0
bl CheckRoomFlag
adds r5, r0, #0
cmp r5, #0
beq _0806F222
adds r0, r4, #0
bl ClearRoomFlag
b _0806F248
_0806F28A:
adds r0, r4, #0
bl CheckLocalFlag
adds r5, r0, #0
cmp r5, #0
beq _0806F232
adds r0, r4, #0
bl ClearLocalFlag
b _0806F248
_0806F29E:
adds r0, r4, #0
bl CheckGlobalFlag
adds r5, r0, #0
cmp r5, #0
bne _0806F2B2
adds r0, r4, #0
bl SetGlobalFlag
b _0806F248
_0806F2B2:
adds r0, r4, #0
bl ClearGlobalFlag
b _0806F248
_0806F2BA:
ldr r4, [r6]
asrs r1, r4, #0xc
movs r0, #0xf
ands r1, r0
ldr r0, _0806F2D8 @ =0x00000FFF
ands r4, r0
movs r5, #0
cmp r1, #4
bhi _0806F248
lsls r0, r1, #2
ldr r1, _0806F2DC @ =_0806F2E0
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0806F2D8: .4byte 0x00000FFF
_0806F2DC: .4byte _0806F2E0
_0806F2E0: @ jump table
.4byte _0806F2F4 @ case 0
.4byte _0806F2FC @ case 1
.4byte _0806F304 @ case 2
.4byte _0806F30C @ case 3
.4byte _0806F314 @ case 4
_0806F2F4:
adds r0, r4, #0
bl CheckRoomFlag
b _0806F320
_0806F2FC:
adds r0, r4, #0
bl CheckLocalFlag
b _0806F320
_0806F304:
adds r0, r4, #0
bl CheckGlobalFlag
b _0806F320
_0806F30C:
adds r0, r4, #0
bl CheckKinstoneFused
b _0806F320
_0806F314:
adds r0, r4, #0
bl GetInventoryValue
cmp r0, #0
beq _0806F320
movs r0, #1
_0806F320:
adds r5, r0, #0
b _0806F248
_0806F324:
ldr r1, [r6, #4]
cmp r1, #0
beq _0806F332
mov r0, r8
bl _call_via_r1
b _0806F35E
_0806F332:
movs r0, #0
b _0806F34E
_0806F336:
ldr r0, _0806F348 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
cmp r0, #0
beq _0806F34C
_0806F342:
ldrh r0, [r6, #6]
b _0806F34E
.align 2, 0
_0806F348: .4byte gPlayerState
_0806F34C:
ldrh r0, [r6, #4]
_0806F34E:
cmp r7, #0
beq _0806F35A
mov r1, r8
bl MessageNoOverlap
b _0806F35E
_0806F35A:
bl MessageFromTarget
_0806F35E:
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.syntax divided
+30
View File
@@ -0,0 +1,30 @@
.syntax unified
push {r4, r5, lr}
adds r2, r0, #0
movs r1, #0x2e
ldrsh r0, [r2, r1]
ldr r4, [r2, #0x48]
movs r1, #0
ldrsb r1, [r4, r1]
adds r0, r0, r1
ldr r3, _0806F7CC @ =gRoomControls
ldrh r1, [r3, #6]
subs r0, r0, r1
movs r5, #0x32
ldrsh r1, [r2, r5]
movs r2, #1
ldrsb r2, [r4, r2]
adds r1, r1, r2
ldrh r2, [r3, #8]
subs r1, r1, r2
movs r2, #0x3f
lsrs r0, r0, #4
ands r0, r2
lsrs r1, r1, #4
ands r1, r2
lsls r1, r1, #6
adds r0, r0, r1
pop {r4, r5, pc}
.align 2, 0
_0806F7CC: .4byte gRoomControls
.syntax divided
+25
View File
@@ -0,0 +1,25 @@
.syntax unified
push {r4, r5, r6, lr}
mov r6, r8
push {r6}
adds r4, r2, #0
adds r5, r3, #0
movs r2, #0x2e
ldrsh r6, [r0, r2]
movs r2, #0x32
ldrsh r3, [r0, r2]
mov r8, r3
movs r3, #0x2e
ldrsh r2, [r1, r3]
adds r2, r2, r4
movs r0, #0x32
ldrsh r3, [r1, r0]
adds r3, r3, r5
adds r0, r6, #0
mov r1, r8
bl sub_080045D4
pop {r3}
mov r8, r3
pop {r4, r5, r6, pc}
.align 2, 0
.syntax divided
+48
View File
@@ -0,0 +1,48 @@
.syntax unified
push {r4, lr}
adds r2, r0, #0
ldrb r4, [r2, #0x14]
ldrb r1, [r2, #0x15]
movs r0, #0x80
ands r0, r1
cmp r0, #0
bne _0806F9E6
movs r0, #0x1c
ands r0, r1
lsrs r3, r0, #2
movs r1, #1
adds r0, r3, #0
ands r0, r1
cmp r0, #0
beq _0806F9C4
subs r0, r3, r4
adds r0, #1
movs r1, #4
ands r0, r1
cmp r0, #0
beq _0806F9E6
_0806F9C4:
ldrb r0, [r2, #0x15]
lsrs r0, r0, #2
movs r1, #0x7e
ands r0, r1
strb r0, [r2, #0x14]
adds r4, r0, #0
cmp r4, #4
bhi _0806F9DE
ldrb r1, [r2, #0x18]
movs r0, #0x41
rsbs r0, r0, #0
ands r0, r1
b _0806F9E4
_0806F9DE:
ldrb r0, [r2, #0x18]
movs r1, #0x40
orrs r0, r1
_0806F9E4:
strb r0, [r2, #0x18]
_0806F9E6:
adds r0, r4, #0
pop {r4, pc}
.align 2, 0
.syntax divided
+65
View File
@@ -0,0 +1,65 @@
.syntax unified
push {r4, r5, r6, r7, lr}
sub sp, #4
ldr r7, _0806F114 @ =gUnk_03003DA8
ldr r5, [r7, #4]
movs r0, #0
cmp r5, r7
beq _0806F0BA
_0806F0B2:
adds r0, #1
ldr r5, [r5, #4]
cmp r5, r7
bne _0806F0B2
_0806F0BA:
cmp r0, #1
bls _0806F10E
ldr r5, [r7, #4]
cmp r5, r7
beq _0806F10E
movs r2, #1
_0806F0C6:
ldrb r1, [r5, #0x10]
adds r0, r2, #0
ands r0, r1
cmp r0, #0
beq _0806F108
ldrb r1, [r5, #0x17]
adds r0, r2, #0
ands r0, r1
cmp r0, #0
beq _0806F108
ldr r4, [r5, #4]
cmp r4, r7
beq _0806F108
movs r6, #1
_0806F0E2:
ldrb r1, [r4, #0x10]
adds r0, r6, #0
ands r0, r1
cmp r0, #0
beq _0806F102
ldrb r1, [r4, #0x17]
adds r0, r6, #0
ands r0, r1
cmp r0, #0
beq _0806F102
adds r0, r5, #0
adds r1, r4, #0
str r2, [sp]
bl sub_08004484
ldr r2, [sp]
_0806F102:
ldr r4, [r4, #4]
cmp r4, r7
bne _0806F0E2
_0806F108:
ldr r5, [r5, #4]
cmp r5, r7
bne _0806F0C6
_0806F10E:
add sp, #4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0806F114: .4byte gUnk_03003DA8
.syntax divided