Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-03-21 17:25:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed incorrect ov10 calls

Browse Source
This commit is contained in:
AnonymousRandomPerson 2023-07-09 20:43:44 -04:00
parent 197ba2abf1
commit e352ec7451
3 changed files with 116 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/include/overlay_07.inc
View File

@ -16,7 +16,7 @@
.public ov01_0232C10C
.public sub_02047150
.public sub_0202D5E4
.public ov10_022BCDBC
.public ov00_022BCDBC
.public ov00_022BD2F4
.public ov00_022BD5A0
.public sub_0202D59C
@ -69,7 +69,7 @@
.public sub_0202D55C
.public GetLanguageType
.public ov01_02339988
.public ov10_022BD744
.public ov00_022BD744
.public InitPreprocessorArgs
.public StrncpySimpleNoPadSafe
.public ov00_022BCCAC

136
asm/overlay_00.s
View File

@ -275,30 +275,105 @@ ov00_022BCDA4: ; 0x022BCDA4
_022BCDB4: .word 0x023187A0
_022BCDB8: .word ov00_022DB9EC
arm_func_end ov00_022BCDA4
_022BCDBC:
.byte 0xF8, 0x4F, 0x2D, 0xE9
.byte 0x10, 0xD0, 0x4D, 0xE2, 0x00, 0xA0, 0xB0, 0xE1, 0x01, 0x90, 0xA0, 0xE1, 0x00, 0x20, 0x8D, 0xE5
.byte 0x04, 0x00, 0xA0, 0x03, 0x4B, 0x00, 0x00, 0x0A, 0x6B, 0x7A, 0x00, 0xEB, 0x00, 0x00, 0x50, 0xE3
.byte 0x04, 0x00, 0xA0, 0x03, 0x47, 0x00, 0x00, 0x0A, 0x04, 0x00, 0x8D, 0xE2, 0xD6, 0xFF, 0xFF, 0xEB
.byte 0x04, 0x10, 0x8D, 0xE2, 0x0A, 0x00, 0xA0, 0xE1, 0x3E, 0x7B, 0x00, 0xEB, 0x00, 0x00, 0x50, 0xE3
.byte 0x01, 0x00, 0xA0, 0x13, 0x3F, 0x00, 0x00, 0x1A, 0x00, 0x01, 0x9F, 0xE5, 0x0A, 0x10, 0xA0, 0xE1
.byte 0x0C, 0x00, 0x90, 0xE5, 0xDC, 0x7A, 0x00, 0xEB, 0x00, 0x50, 0xA0, 0xE3, 0x00, 0x70, 0xA0, 0xE1
.byte 0x01, 0x60, 0x45, 0xE2, 0x00, 0xB0, 0xE0, 0xE3, 0x20, 0x00, 0x00, 0xEA, 0x0C, 0x00, 0xA0, 0xE3
.byte 0x95, 0x00, 0x08, 0xE0, 0xD4, 0x00, 0x9F, 0xE5, 0x0C, 0x00, 0x90, 0xE5, 0xE0, 0x00, 0x80, 0xE2
.byte 0x08, 0x00, 0x80, 0xE0, 0x50, 0x7A, 0x00, 0xEB, 0x00, 0x00, 0x50, 0xE3, 0x14, 0x00, 0x00, 0x0A
.byte 0xB8, 0x00, 0x9F, 0xE5, 0x0C, 0x00, 0x90, 0xE5, 0xE0, 0x10, 0x80, 0xE2, 0x08, 0x10, 0x81, 0xE0
.byte 0xC9, 0x7A, 0x00, 0xEB, 0xA4, 0x10, 0x9F, 0xE5, 0x00, 0x40, 0xA0, 0xE1, 0x0C, 0x10, 0x91, 0xE5
.byte 0xE0, 0x00, 0x81, 0xE2, 0x08, 0x10, 0x80, 0xE0, 0x0A, 0x00, 0xA0, 0xE1, 0x1D, 0x7B, 0x00, 0xEB
.byte 0x00, 0x00, 0x50, 0xE3, 0x04, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x54, 0xE3, 0x00, 0x00, 0x57, 0xC3
.byte 0x05, 0x00, 0x00, 0xDA, 0x07, 0x00, 0x54, 0xE1, 0x03, 0x00, 0x00, 0x1A, 0x02, 0x00, 0xA0, 0xE3
.byte 0x18, 0x00, 0x00, 0xEA, 0x0B, 0x00, 0x56, 0xE1, 0x05, 0x60, 0xA0, 0x01, 0x01, 0x50, 0x85, 0xE2
.byte 0x10, 0x00, 0x55, 0xE3, 0xDC, 0xFF, 0xFF, 0xBA, 0x00, 0x00, 0x56, 0xE3, 0x10, 0x00, 0x00, 0xBA
.byte 0x00, 0x00, 0x9D, 0xE5, 0x00, 0x00, 0x50, 0xE3, 0x0B, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x59, 0xE3
.byte 0x04, 0x00, 0xA0, 0x03, 0x0B, 0x00, 0x00, 0x0A, 0x06, 0x08, 0xA0, 0xE1, 0x0A, 0x10, 0xA0, 0xE1
.byte 0x09, 0x20, 0xA0, 0xE1, 0x20, 0x08, 0xA0, 0xE1, 0x1F, 0x00, 0x00, 0xEB, 0x06, 0x08, 0xA0, 0xE1
.byte 0x20, 0x08, 0xA0, 0xE1, 0x00, 0x10, 0xA0, 0xE3, 0xE9, 0x00, 0x00, 0xEB, 0x00, 0x00, 0xA0, 0xE3
.byte 0x00, 0x00, 0x00, 0xEA, 0x03, 0x00, 0xA0, 0xE3, 0x10, 0xD0, 0x8D, 0xE2, 0xF8, 0x8F, 0xBD, 0xE8
.byte 0xA0, 0x87, 0x31, 0x02
arm_func_start ov00_022BCDBC
ov00_022BCDBC: ; 0x022BCDBC
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #0x10
movs sl, r0
mov sb, r1
str r2, [sp]
moveq r0, #4
beq _022BCF08
bl ov00_022DB78C
cmp r0, #0
moveq r0, #4
beq _022BCF08
add r0, sp, #4
bl ov00_022BCD4C
add r1, sp, #4
mov r0, sl
bl ov00_022DBAF8
cmp r0, #0
movne r0, #1
bne _022BCF08
ldr r0, _022BCF10 ; =0x023187A0
mov r1, sl
ldr r0, [r0, #0xc]
bl ov00_022DB98C
mov r5, #0
mov r7, r0
sub r6, r5, #1
mvn fp, #0
b _022BCEB0
_022BCE2C:
mov r0, #0xc
mul r8, r5, r0
ldr r0, _022BCF10 ; =0x023187A0
ldr r0, [r0, #0xc]
add r0, r0, #0xe0
add r0, r0, r8
bl ov00_022DB78C
cmp r0, #0
beq _022BCEA4
ldr r0, _022BCF10 ; =0x023187A0
ldr r0, [r0, #0xc]
add r1, r0, #0xe0
add r1, r1, r8
bl ov00_022DB98C
ldr r1, _022BCF10 ; =0x023187A0
mov r4, r0
ldr r1, [r1, #0xc]
add r0, r1, #0xe0
add r1, r0, r8
mov r0, sl
bl ov00_022DBAF8
cmp r0, #0
bne _022BCE9C
cmp r4, #0
cmpgt r7, #0
ble _022BCEAC
cmp r4, r7
bne _022BCEAC
_022BCE9C:
mov r0, #2
b _022BCF08
_022BCEA4:
cmp r6, fp
moveq r6, r5
_022BCEAC:
add r5, r5, #1
_022BCEB0:
cmp r5, #0x10
blt _022BCE2C
cmp r6, #0
blt _022BCF04
ldr r0, [sp]
cmp r0, #0
beq _022BCEFC
cmp sb, #0
moveq r0, #4
beq _022BCF08
mov r0, r6, lsl #0x10
mov r1, sl
mov r2, sb
mov r0, r0, lsr #0x10
bl ov00_022BCF6C
mov r0, r6, lsl #0x10
mov r0, r0, lsr #0x10
mov r1, #0
bl ov00_022BD2A4
_022BCEFC:
mov r0, #0
b _022BCF08
_022BCF04:
mov r0, #3
_022BCF08:
add sp, sp, #0x10
ldmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_022BCF10: .word 0x023187A0
arm_func_end ov00_022BCDBC
arm_func_start ov00_022BCF14
ov00_022BCF14: ; 0x022BCF14
@ -1050,9 +1125,16 @@ ov00_022BD730: ; 0x022BD730
.align 2, 0
_022BD740: .word 0x023187A0
arm_func_end ov00_022BD730
_022BD744:
.byte 0x08, 0x10, 0x9F, 0xE5, 0x0C, 0x10, 0x91, 0xE5, 0xEB, 0x01, 0xC1, 0xE5
.byte 0x1E, 0xFF, 0x2F, 0xE1, 0xA0, 0x87, 0x31, 0x02
arm_func_start ov00_022BD744
ov00_022BD744: ; 0x022BD744
ldr r1, _022BD754 ; =0x023187A0
ldr r1, [r1, #0xc]
strb r0, [r1, #0x1eb]
bx lr
.align 2, 0
_022BD754: .word 0x023187A0
arm_func_end ov00_022BD744
arm_func_start ov00_022BD758
ov00_022BD758: ; 0x022BD758

10
asm/overlay_07.s
View File

@ -1642,7 +1642,7 @@ _0233E06C:
mov r1, #0
mov r2, r1
add r0, r4, #0x48
bl ov10_022BCDBC
bl ov00_022BCDBC
cmp r0, #2
bne _0233E0D0
add r0, r4, #0x48
@ -1841,7 +1841,7 @@ _0233E33C:
add r0, r4, #0x48
add r1, r4, #0x3c
mov r2, #1
bl ov10_022BCDBC
bl ov00_022BCDBC
_0233E34C:
mov r1, #1
add r0, sp, #0x104
@ -2703,7 +2703,7 @@ _0233EF98:
add r0, r1, #0x10
add r1, r1, #0x30
mov r2, #0
bl ov10_022BCDBC
bl ov00_022BCDBC
cmp r0, #2
bne _0233EFD0
ldr r1, _0233F5C8 ; =0x00003701
@ -3010,7 +3010,7 @@ _0233F3F0:
ldr r1, [r0]
add r0, r1, #0x10
add r1, r1, #0x30
bl ov10_022BCDBC
bl ov00_022BCDBC
ldr r1, _0233F5F0 ; =0x000036FE
mov r0, #0x1c
bl ov07_0233F6AC
@ -5149,7 +5149,7 @@ _02341234:
ldrb r0, [r4, #0x2b4]
bl ov00_022BD730
ldrb r0, [r4, #0x2b5]
bl ov10_022BD744
bl ov00_022BD744
ldrb r0, [r4, #0x2b6]
bl ov00_022BD758
ldrb r0, [r4, #0x2b7]