dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

through sub_812EB2C

Browse Source
This commit is contained in:
scnorton
2019-04-09 11:23:33 -04:00
parent 7f920b887f
commit d54a9b56da
7 changed files with 543 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/oak_speech.s
-283
View File
@@ -5,289 +5,6 @@
.text
thumb_func_start sub_812E944
sub_812E944: @ 812E944
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
mov r10, r0
adds r0, r1, 0
adds r5, r2, 0
adds r6, r3, 0
ldr r1, [sp, 0x20]
mov r8, r1
ldr r1, [sp, 0x24]
mov r2, r10
lsls r2, 24
lsrs r2, 24
mov r10, r2
lsls r0, 24
lsrs r7, r0, 24
lsls r5, 24
lsrs r5, 24
lsls r6, 24
lsrs r6, 24
mov r0, r8
lsls r0, 24
lsrs r0, 24
mov r8, r0
lsls r1, 24
lsrs r1, 24
ldr r0, _0812E9DC @ =sub_812E9F8
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _0812E9E0 @ =gTasks
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
adds r4, r1
mov r1, r10
lsls r0, r1, 8
strh r0, [r4, 0x8]
lsls r2, r7, 8
mov r9, r2
strh r2, [r4, 0xA]
strh r5, [r4, 0xC]
strh r6, [r4, 0xE]
subs r5, r1
lsls r5, 8
adds r0, r5, 0
mov r1, r8
bl __divsi3
strh r0, [r4, 0x10]
subs r6, r7
lsls r6, 8
adds r0, r6, 0
mov r1, r8
bl __divsi3
strh r0, [r4, 0x12]
mov r0, r8
strh r0, [r4, 0x18]
mov r1, r9
mov r2, r10
orrs r1, r2
mov r9, r1
movs r0, 0x52
bl SetGpuReg
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0812E9DC: .4byte sub_812E9F8
_0812E9E0: .4byte gTasks
thumb_func_end sub_812E944
thumb_func_start sub_812E9E4
sub_812E9E4: @ 812E9E4
push {lr}
ldr r0, _0812E9F4 @ =sub_812E9F8
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0812E9F4: .4byte sub_812E9F8
thumb_func_end sub_812E9E4
thumb_func_start sub_812E9F8
sub_812E9F8: @ 812E9F8
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, _0812EA28 @ =gTasks+0x8
adds r4, r0, r1
ldrh r1, [r4, 0x10]
movs r2, 0x10
ldrsh r0, [r4, r2]
cmp r0, 0
beq _0812EA6E
movs r2, 0xC
ldrsh r0, [r4, r2]
cmp r0, 0
bne _0812EA2C
ldrh r0, [r4, 0x8]
ldrh r1, [r4]
adds r0, r1
strh r0, [r4]
movs r0, 0x1
b _0812EA4C
.align 2, 0
_0812EA28: .4byte gTasks+0x8
_0812EA2C:
subs r0, r1, 0x1
strh r0, [r4, 0x10]
lsls r0, 16
cmp r0, 0
beq _0812EA3E
ldrh r0, [r4, 0xA]
ldrh r2, [r4, 0x2]
adds r0, r2
b _0812EA48
_0812EA3E:
ldrh r0, [r4, 0x4]
lsls r0, 8
strh r0, [r4]
ldrh r0, [r4, 0x6]
lsls r0, 8
_0812EA48:
strh r0, [r4, 0x2]
movs r0, 0
_0812EA4C:
strh r0, [r4, 0xC]
ldrh r0, [r4, 0x2]
ldr r1, _0812EA74 @ =0xffffff00
ands r1, r0
ldrh r0, [r4]
lsrs r0, 8
orrs r1, r0
movs r0, 0x52
bl SetGpuReg
movs r1, 0x10
ldrsh r0, [r4, r1]
cmp r0, 0
bne _0812EA6E
adds r0, r5, 0
bl DestroyTask
_0812EA6E:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0812EA74: .4byte 0xffffff00
thumb_func_end sub_812E9F8
thumb_func_start sub_812EA78
sub_812EA78: @ 812EA78
push {r4,r5,lr}
lsls r0, 16
lsrs r4, r0, 16
lsls r2, 24
lsrs r5, r2, 24
cmp r4, 0xC9
bne _0812EAB8
adds r0, r1, 0
bl sub_8082AB8
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1A
beq _0812EAA4
cmp r0, 0x1A
bgt _0812EA9E
cmp r0, 0
beq _0812EAB8
b _0812EAB4
_0812EA9E:
cmp r0, 0x1B
beq _0812EAAA
b _0812EAB4
_0812EAA4:
movs r4, 0xCE
lsls r4, 1
b _0812EABC
_0812EAAA:
ldr r4, _0812EAB0 @ =0x0000019d
b _0812EABC
.align 2, 0
_0812EAB0: .4byte 0x0000019d
_0812EAB4:
adds r4, r0, 0
adds r4, 0xFB
_0812EAB8:
cmp r4, 0
beq _0812EAD6
_0812EABC:
cmp r5, 0x4
bhi _0812EAD6
subs r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
ldr r1, _0812EAE0 @ =gUnknown_845FD54
lsls r0, r4, 2
adds r0, r4
adds r0, r5, r0
adds r2, r0, r1
ldrb r0, [r2]
cmp r0, 0xFF
bne _0812EAD8
_0812EAD6:
movs r0, 0x20
_0812EAD8:
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_0812EAE0: .4byte gUnknown_845FD54
thumb_func_end sub_812EA78
thumb_func_start sub_812EAE4
sub_812EAE4: @ 812EAE4
push {lr}
lsls r0, 16
lsrs r0, 16
lsls r2, 24
lsrs r2, 24
bl sub_812EA78
subs r0, 0x20
lsls r0, 24
asrs r0, 24
pop {r1}
bx r1
thumb_func_end sub_812EAE4
thumb_func_start sub_812EAFC
sub_812EAFC: @ 812EAFC
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_812EAFC
thumb_func_start sub_812EB10
sub_812EB10: @ 812EB10
push {lr}
bl RunTasks
bl RunTextPrinters
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_812EB10
thumb_func_start sub_812EB2C
sub_812EB2C: @ 812EB2C
push {lr}
ldr r0, _0812EB48 @ =gPlttBufferUnfaded
movs r1, 0
strh r1, [r0]
ldr r0, _0812EB4C @ =gPlttBufferFaded
strh r1, [r0]
ldr r0, _0812EB50 @ =sub_812EB58
bl CreateTask
ldr r0, _0812EB54 @ =sub_812EB10
bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_0812EB48: .4byte gPlttBufferUnfaded
_0812EB4C: .4byte gPlttBufferFaded
_0812EB50: .4byte sub_812EB58
_0812EB54: .4byte sub_812EB10
thumb_func_end sub_812EB2C
thumb_func_start sub_812EB58
sub_812EB58: @ 812EB58
push {r4-r6,lr}
asm/wild_encounter.s
+4 -4
View File
@@ -482,7 +482,7 @@ _08082A8E:
lsrs r0, 16
orrs r4, r0
adds r0, r4, 0
bl sub_8082AB8
bl GetUnownLetterByPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, r5
@@ -493,8 +493,8 @@ _08082A8E:
bx r1
thumb_func_end sub_8082A88
thumb_func_start sub_8082AB8
sub_8082AB8: @ 8082AB8
thumb_func_start GetUnownLetterByPersonality
GetUnownLetterByPersonality: @ 8082AB8
push {lr}
adds r2, r0, 0
movs r0, 0xC0
@@ -520,7 +520,7 @@ sub_8082AB8: @ 8082AB8
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end sub_8082AB8
thumb_func_end GetUnownLetterByPersonality
thumb_func_start sub_8082AEC
sub_8082AEC: @ 8082AEC