mirror of
https://github.com/pret/pmd-sky.git
synced 2026-03-21 17:25:15 -05:00
Closer to matching arm7
This commit is contained in:
AnonymousRandomPerson
parent
17dbb0d491
commit
95ec71b830
23
sub/arm7.lsf
23
sub/arm7.lsf
|
|
@ -1,17 +1,24 @@
|
|||
Static arm7
|
||||
{
|
||||
Address 0x02000000
|
||||
Address 0x02380000
|
||||
StackSize 1024 1024
|
||||
}
|
||||
|
||||
Autoload MAIN
|
||||
{
|
||||
Address 0x027E0000
|
||||
Object asm/main.o
|
||||
}
|
||||
|
||||
Autoload WRAM
|
||||
{
|
||||
Address 0x037F8000
|
||||
Object asm/wram.o
|
||||
}
|
||||
Object asm/wram.o (.wram)
|
||||
}
|
||||
|
||||
Autoload MAIN
|
||||
{
|
||||
Address 0x027E0000
|
||||
Object asm/main.o
|
||||
Object asm/main.o (.wram)
|
||||
}
|
||||
|
||||
Autoload EXT_WRAM
|
||||
{
|
||||
Address 0x06000000
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
#pragma once
|
||||
.public sub_037FE708
|
||||
.public sub_03803830
|
||||
.public sub_037FC054
|
||||
.public sub_037F886C
|
||||
.public sub_037F9198
|
||||
.public sub_038039E8
|
||||
.public sub_03803B0C
|
||||
.public sub_037FD5C0
|
||||
.public sub_037FB32C
|
||||
.public sub_037FB928
|
||||
.public sub_037FE5A8
|
||||
.public sub_037FE070
|
||||
.public sub_037F8DE0
|
||||
.public sub_037FC90C
|
||||
.public sub_03807380
|
||||
.public sub_037FC468
|
||||
.public sub_037F8598
|
||||
.public sub_037FBBFC
|
||||
.public sub_037FDD00
|
||||
.public sub_037FDFEC
|
||||
.public sub_037FD4DC
|
||||
.public sub_037FB420
|
||||
.public sub_037F8988
|
||||
.public sub_037FCD84
|
||||
.public sub_037FE12C
|
||||
.public sub_03803B28
|
||||
.public sub_037FD898
|
||||
.public sub_03803B40
|
||||
.public sub_037FC760
|
||||
.public sub_037FD3A0
|
||||
.public sub_037F9238
|
||||
.public sub_037FB7BC
|
||||
.public sub_03806BC8
|
||||
.public sub_037FB454
|
||||
.public sub_037FDE70
|
||||
.public sub_037FC6D4
|
||||
.public sub_037FB3B4
|
||||
.public sub_0380521C
|
||||
.public sub_037FE39C
|
||||
.public sub_037FDFD0
|
||||
.public sub_037FDD14
|
||||
.public sub_037FCC74
|
||||
.public sub_037FC558
|
||||
.public sub_037FDF9C
|
||||
.public sub_037F8D58
|
||||
.public sub_037FD884
|
||||
.public sub_037F8A80
|
||||
.public sub_037FC870
|
||||
.public sub_037FC888
|
||||
.public sub_037FC15C
|
||||
.public sub_037FC3C0
|
||||
.public sub_037FDF74
|
||||
.public sub_037FDA38
|
||||
.public sub_037FC36C
|
||||
.public sub_037F87AC
|
||||
.public sub_037FDE88
|
||||
.public sub_03803A48
|
||||
.public sub_037FE410
|
||||
.public sub_0380398C
|
||||
.public sub_037FC590
|
||||
.public sub_037F8908
|
||||
.public sub_037F8650
|
||||
.public sub_037FE588
|
||||
.public sub_038073D4
|
||||
.public sub_037FC6AC
|
||||
.public sub_037FB8F0
|
||||
.public sub_037FACB4
|
||||
.public sub_037FE2B4
|
||||
.public sub_03806B80
|
||||
.public sub_037FD21C
|
||||
.public sub_037FD390
|
||||
.public sub_037FD54C
|
||||
.public sub_03806DD4
|
||||
.public sub_037FE014
|
||||
.public sub_03807334
|
||||
.public sub_03803B7C
|
||||
|
|
@ -1,167 +1,39 @@
|
|||
#pragma once
|
||||
.public sub_0302CA0C
|
||||
.public sub_04000100
|
||||
.public sub_0302AC10
|
||||
.public sub_0302D660
|
||||
.public sub_03027D88
|
||||
.public sub_030331D8
|
||||
.public sub_00FF2394
|
||||
.public sub_00FFA62C
|
||||
.public sub_0302CB90
|
||||
.public sub_03803828
|
||||
.public sub_00FF1EDC
|
||||
.public sub_0302D78C
|
||||
.public sub_027E29A8
|
||||
.public sub_00FF1E9C
|
||||
.public sub_00FFCEA8
|
||||
.public sub_00FF207C
|
||||
.public sub_00FF0F2C
|
||||
.public sub_038037D2
|
||||
.public sub_037FD5C0
|
||||
.public sub_0302B118
|
||||
.public sub_03027F9C
|
||||
.public sub_037FE2C0
|
||||
.public sub_0302CCCC
|
||||
.public sub_0302D228
|
||||
.public sub_030280F8
|
||||
.public sub_0302DAA4
|
||||
.public sub_037FBA18
|
||||
.public sub_03027E40
|
||||
.public sub_00FF8EBC
|
||||
.public sub_00FF46F8
|
||||
.public sub_0302BD48
|
||||
.public sub_038037DE
|
||||
.public sub_03036BC4
|
||||
.public sub_03036B24
|
||||
.public sub_0302D860
|
||||
.public sub_00FF3158
|
||||
.public sub_00FF2D44
|
||||
.public sub_038037F8
|
||||
.public sub_038037D6
|
||||
.public sub_00FF2F0C
|
||||
.public sub_0302B3EC
|
||||
.public sub_00FF76A8
|
||||
.public sub_00FFA7A8
|
||||
.public sub_0302805C
|
||||
.public sub_03028548
|
||||
.public sub_038037E6
|
||||
.public sub_030365C4
|
||||
.public sub_0302D678
|
||||
.public sub_027F4E10
|
||||
.public sub_0302BF50
|
||||
.public sub_037FBB58
|
||||
.public sub_03028178
|
||||
.public sub_0302DC00
|
||||
.public sub_0303317C
|
||||
.public sub_00FF3A18
|
||||
.public sub_0302D504
|
||||
.public sub_00FF3A2C
|
||||
.public sub_030363B8
|
||||
.public sub_037FD884
|
||||
.public sub_0302C078
|
||||
.public sub_0302B844
|
||||
.public sub_0302DD98
|
||||
.public sub_0302BC58
|
||||
.public sub_0302BBB0
|
||||
.public sub_03036B70
|
||||
.public sub_0302CDB0
|
||||
.public sub_0302C060
|
||||
.public sub_037FB454
|
||||
.public sub_0302D088
|
||||
.public sub_0302BB5C
|
||||
.public sub_030285D0
|
||||
.public sub_0302D7C0
|
||||
.public sub_0302A4A4
|
||||
.public sub_00FF2BA4
|
||||
.public sub_038037B8
|
||||
.public sub_0302B94C
|
||||
.public sub_0302B0E0
|
||||
.public sub_00FF90F0
|
||||
.public sub_03028270
|
||||
.public sub_0302C0FC
|
||||
.public sub_0380382C
|
||||
.public sub_0302DEF8
|
||||
.public sub_00FF2F54
|
||||
.public sub_0302DB8C
|
||||
.public sub_00FF20C8
|
||||
.public sub_00FE81E8
|
||||
.public sub_0302AFAC
|
||||
.public sub_037FDF74
|
||||
.public sub_0302D804
|
||||
.public sub_00FFAA28
|
||||
.public sub_00FFA954
|
||||
.public sub_037FE588
|
||||
.public sub_0302C464
|
||||
.public sub_00FF93C4
|
||||
.public sub_037FDA38
|
||||
.public sub_00FF8464
|
||||
.public sub_0302DD78
|
||||
.public sub_00FF9384
|
||||
.public sub_0302AB1C
|
||||
.public sub_037FBA94
|
||||
.public sub_00FF9760
|
||||
.public sub_00FF93EC
|
||||
.public sub_037FDF9C
|
||||
.public sub_03036370
|
||||
.public sub_0302BE9C
|
||||
.public sub_00FF1F64
|
||||
.public sub_00FF3254
|
||||
.public sub_00FF80DC
|
||||
.public sub_03028988
|
||||
.public sub_0302CB80
|
||||
.public sub_00FF2DE8
|
||||
.public sub_0302D764
|
||||
.public sub_0302C574
|
||||
.public sub_03034A0C
|
||||
.public sub_0302D4F0
|
||||
.public sub_0302BEC4
|
||||
.public sub_03033020
|
||||
.public sub_03028A28
|
||||
.public sub_0302ABA4
|
||||
.public sub_0302D91C
|
||||
.public sub_0302BD80
|
||||
.public sub_00FF611C
|
||||
.public sub_027E05D8
|
||||
.public sub_03803804
|
||||
.public sub_027E91B0
|
||||
.public sub_00FFD7A0
|
||||
.public sub_00FFD194
|
||||
.public sub_037F8598
|
||||
.public sub_027E956C
|
||||
.public sub_03803168
|
||||
.public sub_027E8FE4
|
||||
.public sub_00FFD1BC
|
||||
.public sub_037FB63C
|
||||
.public sub_027E95D0
|
||||
.public sub_027E9290
|
||||
.public sub_03806610
|
||||
.public sub_027E8EBC
|
||||
.public sub_027E9338
|
||||
.public sub_0200E3FC
|
||||
.public sub_027E9084
|
||||
.public sub_037F8000
|
||||
.public sub_027E90A8
|
||||
.public sub_037FC6D4
|
||||
.public sub_030332FC
|
||||
.public sub_027E9140
|
||||
.public sub_03033330
|
||||
.public sub_0200E792
|
||||
.public sub_0302D7DC
|
||||
.public sub_00FFDEAC
|
||||
.public sub_03033318
|
||||
.public sub_027EDEC0
|
||||
.public sub_03808DF0
|
||||
.public sub_027E1C0C
|
||||
.public sub_037FB32C
|
||||
.public sub_00FFD364
|
||||
.public sub_027E9260
|
||||
.public sub_0303336C
|
||||
.public sub_027E9178
|
||||
.public sub_037FB858
|
||||
.public sub_0200E56E
|
||||
.public sub_0302CD3C
|
||||
.public sub_027E44FC
|
||||
.public sub_027E8FB0
|
||||
.public sub_037FC36C
|
||||
.public sub_027E1AE8
|
||||
.public sub_03033238
|
||||
.public sub_027F027C
|
||||
.public sub_027F0CD4
|
||||
.public sub_027EF4C0
|
||||
.public sub_027EA1AC
|
||||
.public sub_027EAB5C
|
||||
.public sub_027E0000
|
||||
.public sub_027F4CC0
|
||||
.public sub_027EDF34
|
||||
.public sub_027F2444
|
||||
.public sub_027F5CC4
|
||||
.public sub_027E9E94
|
||||
.public sub_027F11DC
|
||||
.public sub_027E9CF4
|
||||
.public sub_027EAC00
|
||||
.public sub_027EFEF4
|
||||
.public sub_027F1578
|
||||
.public sub_027EB844
|
||||
.public sub_027EAF70
|
||||
.public sub_027E9CB4
|
||||
.public sub_027F119C
|
||||
.public sub_027EA9BC
|
||||
.public sub_027F2840
|
||||
.public sub_027F0F08
|
||||
.public sub_027EB06C
|
||||
.public sub_027F4FD4
|
||||
.public sub_027F25C0
|
||||
.public sub_027F55B8
|
||||
.public sub_027E9EE0
|
||||
.public sub_027F517C
|
||||
.public sub_027EAD6C
|
||||
.public sub_027E8D44
|
||||
.public sub_027EB830
|
||||
.public sub_027F4FAC
|
||||
.public sub_027E9D7C
|
||||
.public sub_027EAD24
|
||||
.public sub_027F276C
|
||||
.public sub_027EC510
|
||||
.public sub_027F1204
|
||||
|
|
|
|||
18662
sub/asm/main.s
18662
sub/asm/main.s
File diff suppressed because it is too large
Load Diff
15042
sub/asm/wram.s
15042
sub/asm/wram.s
File diff suppressed because it is too large
Load Diff
|
|
@ -1,135 +1,135 @@
|
|||
.include "asm/macros.inc"
|
||||
|
||||
.public sub_020001E8
|
||||
.public sub_037F8000
|
||||
|
||||
.text
|
||||
|
||||
arm_func_start _start
|
||||
_start: ; 0x02000000
|
||||
_start: ; 0x037F7E18
|
||||
mov ip, #0x4000000
|
||||
str ip, [ip, #0x208]
|
||||
ldr r1, _020000E4 ; =0x023801E8
|
||||
ldr r1, _037F7EFC ; =0x023801E8
|
||||
mov r0, #0x3800000
|
||||
cmp r0, r1
|
||||
bpl _0200001C
|
||||
b _02000020
|
||||
_0200001C:
|
||||
bpl _037F7E34
|
||||
b _037F7E38
|
||||
_037F7E34:
|
||||
mov r1, r0
|
||||
_02000020:
|
||||
ldr r2, _020000E8 ; =0x0380FF00
|
||||
_037F7E38:
|
||||
ldr r2, _037F7F00 ; =0x0380FF00
|
||||
mov r0, #0
|
||||
_02000028:
|
||||
_037F7E40:
|
||||
cmp r1, r2
|
||||
blt _02000034
|
||||
b _02000038
|
||||
_02000034:
|
||||
blt _037F7E4C
|
||||
b _037F7E50
|
||||
_037F7E4C:
|
||||
stmia r1!, {r0}
|
||||
_02000038:
|
||||
blt _02000028
|
||||
_037F7E50:
|
||||
blt _037F7E40
|
||||
mov r0, #0x13
|
||||
msr cpsr_c, r0
|
||||
ldr sp, _020000EC ; =0x0380FFC0
|
||||
ldr sp, _037F7F04 ; =0x0380FFC0
|
||||
mov r0, #0x12
|
||||
msr cpsr_c, r0
|
||||
ldr r0, _020000F0 ; =0x0380FF80
|
||||
ldr r0, _037F7F08 ; =0x0380FF80
|
||||
mov sp, r0
|
||||
ldr r1, _020000F4 ; =0x00000400
|
||||
ldr r1, _037F7F0C ; =0x00000400
|
||||
sub r1, r0, r1
|
||||
mov r0, #0x1f
|
||||
msr cpsr_fsxc, r0
|
||||
sub sp, r1, #4
|
||||
ldr r0, _020000F8 ; =0x023FE940
|
||||
ldr r1, _020000FC ; =0x027FFA80
|
||||
ldr r0, _037F7F10 ; =0x023FE940
|
||||
ldr r1, _037F7F14 ; =0x027FFA80
|
||||
add r2, r1, #0x160
|
||||
_02000078:
|
||||
_037F7E90:
|
||||
ldr r3, [r0], #4
|
||||
str r3, [r1], #4
|
||||
cmp r1, r2
|
||||
bmi _02000078
|
||||
ldr r0, _02000100 ; =0x023FE904
|
||||
bmi _037F7E90
|
||||
ldr r0, _037F7F18 ; =0x023FE904
|
||||
add r2, r1, #0x20
|
||||
_02000090:
|
||||
_037F7EA8:
|
||||
ldr r3, [r0], #4
|
||||
str r3, [r1], #4
|
||||
cmp r1, r2
|
||||
bmi _02000090
|
||||
bmi _037F7EA8
|
||||
bl do_autoload
|
||||
ldr r0, _02000104 ; =0x023801D0
|
||||
ldr r0, _037F7F1C ; =0x023801D0
|
||||
ldr r1, [r0, #0xc]
|
||||
ldr r2, [r0, #0x10]
|
||||
mov r0, #0
|
||||
_020000B4:
|
||||
_037F7ECC:
|
||||
cmp r1, r2
|
||||
blo _020000C0
|
||||
b _020000C4
|
||||
_020000C0:
|
||||
blo _037F7ED8
|
||||
b _037F7EDC
|
||||
_037F7ED8:
|
||||
str r0, [r1], #4
|
||||
_020000C4:
|
||||
blo _020000B4
|
||||
bl sub_0200018C
|
||||
ldr r1, _02000108 ; =0x0380FFFC
|
||||
ldr r0, _0200010C ; =0x037FB488
|
||||
_037F7EDC:
|
||||
blo _037F7ECC
|
||||
bl sub_037F7FA4
|
||||
ldr r1, _037F7F20 ; =0x0380FFFC
|
||||
ldr r0, _037F7F24 ; =0x037FB488
|
||||
str r0, [r1]
|
||||
ldr r1, _02000110 ; =sub_037F8000
|
||||
ldr lr, _02000114 ; =0xFFFF0000
|
||||
ldr r1, _037F7F28 ; =sub_037F8000
|
||||
ldr lr, _037F7F2C ; =0xFFFF0000
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_020000E4: .word 0x023801E8
|
||||
_020000E8: .word 0x0380FF00
|
||||
_020000EC: .word 0x0380FFC0
|
||||
_020000F0: .word 0x0380FF80
|
||||
_020000F4: .word 0x00000400
|
||||
_020000F8: .word 0x023FE940
|
||||
_020000FC: .word 0x027FFA80
|
||||
_02000100: .word 0x023FE904
|
||||
_02000104: .word 0x023801D0
|
||||
_02000108: .word 0x0380FFFC
|
||||
_0200010C: .word 0x037FB488
|
||||
_02000110: .word sub_020001E8
|
||||
_02000114: .word 0xFFFF0000
|
||||
_037F7EFC: .word 0x023801E8
|
||||
_037F7F00: .word 0x0380FF00
|
||||
_037F7F04: .word 0x0380FFC0
|
||||
_037F7F08: .word 0x0380FF80
|
||||
_037F7F0C: .word 0x00000400
|
||||
_037F7F10: .word 0x023FE940
|
||||
_037F7F14: .word 0x027FFA80
|
||||
_037F7F18: .word 0x023FE904
|
||||
_037F7F1C: .word 0x023801D0
|
||||
_037F7F20: .word 0x0380FFFC
|
||||
_037F7F24: .word 0x037FB488
|
||||
_037F7F28: .word sub_037F8000
|
||||
_037F7F2C: .word 0xFFFF0000
|
||||
arm_func_end _start
|
||||
|
||||
arm_func_start do_autoload
|
||||
do_autoload: ; 0x02000118
|
||||
ldr r0, _02000184 ; =0x023801D0
|
||||
do_autoload: ; 0x037F7F30
|
||||
ldr r0, _037F7F9C ; =0x023801D0
|
||||
ldr r1, [r0]
|
||||
ldr r2, [r0, #4]
|
||||
ldr r3, [r0, #8]
|
||||
_02000128:
|
||||
_037F7F40:
|
||||
cmp r1, r2
|
||||
beq _02000180
|
||||
beq _037F7F98
|
||||
ldr r4, [r1], #4
|
||||
ldr r5, [r1], #4
|
||||
add r6, r4, r5
|
||||
_0200013C:
|
||||
_037F7F54:
|
||||
cmp r4, r6
|
||||
bmi _02000148
|
||||
b _0200014C
|
||||
_02000148:
|
||||
bmi _037F7F60
|
||||
b _037F7F64
|
||||
_037F7F60:
|
||||
ldr r7, [r3], #4
|
||||
_0200014C:
|
||||
bmi _02000154
|
||||
b _02000158
|
||||
_02000154:
|
||||
_037F7F64:
|
||||
bmi _037F7F6C
|
||||
b _037F7F70
|
||||
_037F7F6C:
|
||||
str r7, [r4], #4
|
||||
_02000158:
|
||||
bmi _0200013C
|
||||
_037F7F70:
|
||||
bmi _037F7F54
|
||||
ldr r5, [r1], #4
|
||||
add r6, r4, r5
|
||||
mov r7, #0
|
||||
_02000168:
|
||||
_037F7F80:
|
||||
cmp r4, r6
|
||||
blo _02000174
|
||||
b _02000178
|
||||
_02000174:
|
||||
blo _037F7F8C
|
||||
b _037F7F90
|
||||
_037F7F8C:
|
||||
str r7, [r4], #4
|
||||
_02000178:
|
||||
blo _02000168
|
||||
beq _02000128
|
||||
_02000180:
|
||||
_037F7F90:
|
||||
blo _037F7F80
|
||||
beq _037F7F40
|
||||
_037F7F98:
|
||||
b _start_AutoloadDoneCallback
|
||||
.align 2, 0
|
||||
_02000184: .word 0x023801D0
|
||||
_037F7F9C: .word 0x023801D0
|
||||
arm_func_end do_autoload
|
||||
|
||||
arm_func_start _start_AutoloadDoneCallback
|
||||
|
|
@ -137,31 +137,31 @@ _start_AutoloadDoneCallback:
|
|||
bx lr
|
||||
arm_func_end _start_AutoloadDoneCallback
|
||||
|
||||
arm_func_start sub_0200018C
|
||||
sub_0200018C: ; 0x0200018C
|
||||
arm_func_start sub_037F7FA4
|
||||
sub_037F7FA4: ; 0x037F7FA4
|
||||
mov r0, #1
|
||||
mov r1, #0
|
||||
ldr r2, _020001CC ; =0x027FFFFA
|
||||
ldr r2, _037F7FE4 ; =0x027FFFFA
|
||||
sub r3, r2, #0x400000
|
||||
_0200019C:
|
||||
_037F7FB4:
|
||||
strh r1, [r2]
|
||||
ldrh ip, [r3]
|
||||
cmp r1, ip
|
||||
bne _020001B0
|
||||
b _020001B4
|
||||
_020001B0:
|
||||
bne _037F7FC8
|
||||
b _037F7FCC
|
||||
_037F7FC8:
|
||||
mov r0, #2
|
||||
_020001B4:
|
||||
bne _020001C4
|
||||
_037F7FCC:
|
||||
bne _037F7FDC
|
||||
add r1, r1, #1
|
||||
cmp r1, #2
|
||||
bne _0200019C
|
||||
_020001C4:
|
||||
bne _037F7FB4
|
||||
_037F7FDC:
|
||||
strh r0, [r2]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_020001CC: .word 0x027FFFFA
|
||||
arm_func_end sub_0200018C
|
||||
_020001D0:
|
||||
_037F7FE4: .word 0x027FFFFA
|
||||
arm_func_end sub_037F7FA4
|
||||
_037F7FE8:
|
||||
.byte 0x68, 0x70, 0x3A, 0x02, 0x80, 0x70, 0x3A, 0x02, 0xE8, 0x01, 0x38, 0x02, 0xE8, 0x01, 0x38, 0x02
|
||||
.byte 0xE8, 0x01, 0x38, 0x02, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0xE8, 0x01, 0x38, 0x02
|
||||
Loading…
Reference in New Issue
Block a user