mirror of
https://github.com/pret/pmd-sky.git
synced 2026-04-23 01:57:23 -05:00
Filled holes in overlay 10
This commit is contained in:
AnonymousRandomPerson
parent
a9d67573d4
commit
9eddddfdd2
|
|
@ -192,3 +192,9 @@
|
|||
.public sub_02057CE8
|
||||
.public sub_02063FC8
|
||||
.public sub_0201E730
|
||||
.public sub_020562B8
|
||||
.public sub_020534BC
|
||||
.public sub_02055CCC
|
||||
.public ov11_023061CC
|
||||
.public ov11_02306C9C
|
||||
.public ov11_02306C64
|
||||
132
asm/overlay_10.s
132
asm/overlay_10.s
|
|
@ -852,31 +852,113 @@ ov10_022BD56C: ; 0x022BD56C
|
|||
.align 2, 0
|
||||
_022BD5A8: .word 0x022DC220
|
||||
arm_func_end ov10_022BD56C
|
||||
_022BD5AC:
|
||||
.byte 0x08, 0x40, 0x2D, 0xE9
|
||||
.byte 0x58, 0x01, 0x9F, 0xE5, 0x00, 0x10, 0x90, 0xE5, 0x00, 0x00, 0x91, 0xE5, 0x04, 0x00, 0x50, 0xE3
|
||||
.byte 0x00, 0xF1, 0x8F, 0x90, 0x4F, 0x00, 0x00, 0xEA, 0x2B, 0x00, 0x00, 0xEA, 0x36, 0x00, 0x00, 0xEA
|
||||
.byte 0x3C, 0x00, 0x00, 0xEA, 0x49, 0x00, 0x00, 0xEA, 0x48, 0x00, 0x00, 0xEA, 0x30, 0x01, 0x9F, 0xE5
|
||||
.byte 0x68, 0x10, 0xA0, 0xE3, 0x00, 0x00, 0x90, 0xE5, 0x20, 0x21, 0x9F, 0xE5, 0x09, 0x0A, 0x80, 0xE2
|
||||
.byte 0x4C, 0x08, 0x90, 0xE5, 0x93, 0x01, 0x20, 0xE0, 0x4C, 0x00, 0x8C, 0xE5, 0x00, 0x00, 0x92, 0xE5
|
||||
.byte 0x4C, 0x00, 0x90, 0xE5, 0xF8, 0x00, 0xD0, 0xE1, 0x2A, 0x63, 0xF6, 0xEB, 0x00, 0x00, 0x50, 0xE3
|
||||
.byte 0x14, 0x00, 0x00, 0x0A, 0xF4, 0x00, 0x9F, 0xE5, 0x00, 0x00, 0x90, 0xE5, 0x4C, 0x10, 0x90, 0xE5
|
||||
.byte 0x08, 0x00, 0x80, 0xE2, 0xA4, 0x57, 0xF6, 0xEB, 0xE0, 0x00, 0x9F, 0xE5, 0x00, 0x20, 0xA0, 0xE3
|
||||
.byte 0x00, 0x10, 0x90, 0xE5, 0x0E, 0x20, 0xC1, 0xE5, 0x00, 0x10, 0x90, 0xE5, 0x0F, 0x20, 0xC1, 0xE5
|
||||
.byte 0x00, 0x00, 0x90, 0xE5, 0x08, 0x00, 0x80, 0xE2, 0x9F, 0x61, 0xF6, 0xEB, 0x00, 0x10, 0xE0, 0xE3
|
||||
.byte 0x01, 0x00, 0x50, 0xE1, 0xB4, 0x00, 0x9F, 0x05, 0x01, 0x10, 0xA0, 0x03, 0x00, 0x00, 0x90, 0x05
|
||||
.byte 0x00, 0x10, 0x80, 0x05, 0x09, 0x00, 0x00, 0x0A, 0xA0, 0x00, 0x9F, 0xE5, 0x00, 0x10, 0x90, 0xE5
|
||||
.byte 0x04, 0x00, 0x91, 0xE5, 0x01, 0x00, 0x80, 0xE2, 0x04, 0x00, 0x81, 0xE5, 0x8C, 0x00, 0x9F, 0xE5
|
||||
.byte 0x00, 0xC0, 0x90, 0xE5, 0x04, 0x30, 0x9C, 0xE5, 0x04, 0x00, 0x53, 0xE3, 0xD2, 0xFF, 0xFF, 0xBA
|
||||
.byte 0x78, 0x00, 0x9F, 0xE5, 0x00, 0x10, 0x90, 0xE5, 0x04, 0x00, 0x91, 0xE5, 0x04, 0x00, 0x50, 0xE3
|
||||
.byte 0x03, 0x00, 0xA0, 0xA3, 0x00, 0x00, 0x81, 0xA5, 0x16, 0x00, 0x00, 0xEA, 0x08, 0x00, 0x81, 0xE2
|
||||
.byte 0xC5, 0x22, 0x01, 0xEB, 0x54, 0x00, 0x9F, 0xE5, 0x02, 0x10, 0xA0, 0xE3, 0x00, 0x00, 0x90, 0xE5
|
||||
.byte 0x00, 0x10, 0x80, 0xE5, 0x0F, 0x00, 0x00, 0xEA, 0x73, 0x25, 0x01, 0xEB, 0x03, 0x00, 0x50, 0xE3
|
||||
.byte 0x04, 0x00, 0x50, 0x13, 0x0B, 0x00, 0x00, 0x1A, 0x61, 0x25, 0x01, 0xEB, 0x2C, 0x00, 0x9F, 0xE5
|
||||
.byte 0x00, 0x10, 0xA0, 0xE3, 0x00, 0x30, 0x90, 0xE5, 0x04, 0x20, 0x93, 0xE5, 0x01, 0x20, 0x82, 0xE2
|
||||
.byte 0x04, 0x20, 0x83, 0xE5, 0x00, 0x00, 0x90, 0xE5, 0x00, 0x10, 0x80, 0xE5, 0x01, 0x00, 0x00, 0xEA
|
||||
.byte 0x02, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8, 0x01, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8
|
||||
.byte 0x20, 0xC2, 0x2D, 0x02, 0x48, 0x0A, 0x0B, 0x02, 0x08, 0x40, 0x2D, 0xE9, 0x1C, 0x00, 0x9F, 0xE5
|
||||
|
||||
arm_func_start ov10_022BD5AC
|
||||
ov10_022BD5AC: ; 0x022BD5AC
|
||||
stmdb sp!, {r3, lr}
|
||||
ldr r0, _022BD710 ; =0x022DC220
|
||||
ldr r1, [r0]
|
||||
ldr r0, [r1]
|
||||
cmp r0, #4
|
||||
addls pc, pc, r0, lsl #2
|
||||
b _022BD708
|
||||
_022BD5C8: ; jump table
|
||||
b _022BD67C ; case 0
|
||||
b _022BD6AC ; case 1
|
||||
b _022BD6C8 ; case 2
|
||||
b _022BD700 ; case 3
|
||||
b _022BD700 ; case 4
|
||||
_022BD5DC:
|
||||
ldr r0, _022BD714 ; =0x020B0A48
|
||||
mov r1, #0x68
|
||||
ldr r0, [r0]
|
||||
ldr r2, _022BD710 ; =0x022DC220
|
||||
add r0, r0, #0x9000
|
||||
ldr r0, [r0, #0x84c]
|
||||
mla r0, r3, r1, r0
|
||||
str r0, [ip, #0x4c]
|
||||
ldr r0, [r2]
|
||||
ldr r0, [r0, #0x4c]
|
||||
ldrsh r0, [r0, #8]
|
||||
bl sub_020562B8
|
||||
cmp r0, #0
|
||||
beq _022BD668
|
||||
ldr r0, _022BD710 ; =0x022DC220
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, #0x4c]
|
||||
add r0, r0, #8
|
||||
bl sub_020534BC
|
||||
ldr r0, _022BD710 ; =0x022DC220
|
||||
mov r2, #0
|
||||
ldr r1, [r0]
|
||||
strb r2, [r1, #0xe]
|
||||
ldr r1, [r0]
|
||||
strb r2, [r1, #0xf]
|
||||
ldr r0, [r0]
|
||||
add r0, r0, #8
|
||||
bl sub_02055CCC
|
||||
mvn r1, #0
|
||||
cmp r0, r1
|
||||
ldreq r0, _022BD710 ; =0x022DC220
|
||||
moveq r1, #1
|
||||
ldreq r0, [r0]
|
||||
streq r1, [r0]
|
||||
beq _022BD690
|
||||
_022BD668:
|
||||
ldr r0, _022BD710 ; =0x022DC220
|
||||
ldr r1, [r0]
|
||||
ldr r0, [r1, #4]
|
||||
add r0, r0, #1
|
||||
str r0, [r1, #4]
|
||||
_022BD67C:
|
||||
ldr r0, _022BD710 ; =0x022DC220
|
||||
ldr ip, [r0]
|
||||
ldr r3, [ip, #4]
|
||||
cmp r3, #4
|
||||
blt _022BD5DC
|
||||
_022BD690:
|
||||
ldr r0, _022BD710 ; =0x022DC220
|
||||
ldr r1, [r0]
|
||||
ldr r0, [r1, #4]
|
||||
cmp r0, #4
|
||||
movge r0, #3
|
||||
strge r0, [r1]
|
||||
b _022BD708
|
||||
_022BD6AC:
|
||||
add r0, r1, #8
|
||||
bl ov11_023061CC
|
||||
ldr r0, _022BD710 ; =0x022DC220
|
||||
mov r1, #2
|
||||
ldr r0, [r0]
|
||||
str r1, [r0]
|
||||
b _022BD708
|
||||
_022BD6C8:
|
||||
bl ov11_02306C9C
|
||||
cmp r0, #3
|
||||
cmpne r0, #4
|
||||
bne _022BD708
|
||||
bl ov11_02306C64
|
||||
ldr r0, _022BD710 ; =0x022DC220
|
||||
mov r1, #0
|
||||
ldr r3, [r0]
|
||||
ldr r2, [r3, #4]
|
||||
add r2, r2, #1
|
||||
str r2, [r3, #4]
|
||||
ldr r0, [r0]
|
||||
str r1, [r0]
|
||||
b _022BD708
|
||||
_022BD700:
|
||||
mov r0, #2
|
||||
ldmia sp!, {r3, pc}
|
||||
_022BD708:
|
||||
mov r0, #1
|
||||
ldmia sp!, {r3, pc}
|
||||
.align 2, 0
|
||||
_022BD710: .word 0x022DC220
|
||||
_022BD714: .word 0x020B0A48
|
||||
arm_func_end ov10_022BD5AC
|
||||
_022BD718:
|
||||
.byte 0x08, 0x40, 0x2D, 0xE9, 0x1C, 0x00, 0x9F, 0xE5
|
||||
.byte 0x00, 0x00, 0x90, 0xE5, 0x00, 0x00, 0x50, 0xE3, 0x08, 0x80, 0xBD, 0x08, 0x95, 0x0E, 0xF5, 0xEB
|
||||
.byte 0x08, 0x00, 0x9F, 0xE5, 0x00, 0x10, 0xA0, 0xE3, 0x00, 0x10, 0x80, 0xE5, 0x08, 0x80, 0xBD, 0xE8
|
||||
.byte 0x20, 0xC2, 0x2D, 0x02
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user