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

Cleaned up more unmapped functions

Browse Source
This commit is contained in:
AnonymousRandomPerson 2023-07-08 22:17:29 -04:00
parent bb08edf420
commit b034d9bc2c
9 changed files with 878 additions and 779 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_00.inc
View File

@ -77,7 +77,7 @@
.public sub_0201DC90
.public sub_02003A40
.public sub_02079B14
.public FUN_02000088
.public sub_02000088
.public sub_0201BE84
.public Memset
.public sub_020024B0

18
asm/include/overlay_11.inc
View File

@ -69,7 +69,7 @@
.public sub_02008F4C
.public ItemZInit
.public sub_02046BE8
.public FUN_02035024
.public sub_02035024
.public sub_020038E8
.public sub_0202FBBC
.public sub_02008F88
@ -275,7 +275,7 @@
.public sub_02008F64
.public IncrementNbBigTreasureWins
.public InitPortraitBoxWithMonsterId
.public FUN_0206C120
.public sub_0206C120
.public sub_0205730C
.public sub_0206A878
.public sub_02063600
@ -373,8 +373,8 @@
.public sub_02065B3C
.public ov10_022BCC7C
.public sub_0206B9DC
.public FUN_0204BECC
.public FUN_0204CA48
.public sub_0204BECC
.public sub_0204CA48
.public sub_0205EC78
.public ov10_022BDB80
.public sub_0201BCF4
@ -410,7 +410,7 @@
.public ScriptSpecialProcess0x3
.public GetLearnableIqSkills
.public GetNameWithGender
.public FUN_02065974
.public sub_02065974
.public sub_02028A64
.public sub_0200B908
.public sub_02017B94
@ -506,7 +506,7 @@
.public sub_02055DD0
.public ShowKeyboard
.public sub_02017B88
.public FUN_02034E60
.public sub_02034E60
.public sub_0204C880
.public sub_0200A5B0
.public sub_02009194
@ -528,7 +528,7 @@
.public GetMaxReachedFloor
.public EnableIqSkill
.public sub_0203F398
.public FUN_02065BD8
.public sub_02065BD8
.public LoadOverlay
.public sub_0201DF38
.public GetItemMoveId16
@ -596,7 +596,7 @@
.public sub_0204804C
.public sub_0203FA64
.public ShowPortraitBox
.public FUN_0206C144
.public sub_0206C144
.public GetNormalMenuResult
.public sub_02034F20
.public MemArenaAlloc
@ -693,7 +693,7 @@
.public sub_02041364
.public sub_0202F16C
.public sub_0201BF64
.public FUN_020367B4
.public sub_020367B4
.public sub_0204F050
.public sub_0203909C
.public GetAdvancedMenuCurrentOption

5
asm/include/overlay_29.inc
View File

@ -654,4 +654,7 @@
.public GetDamageSource
.public GetVictoriesOnOneFloor
.public GetRegenSpeed
.public ov30_02382874
.public ov30_02382874
.public DebugPrint0__0200C1FC
.public GetSpriteIndex__020526EC
.public GetSpriteIndex__02052708

459
asm/main.s
View File

File diff suppressed because it is too large Load Diff

58
asm/overlay_00.s
View File

@ -10560,8 +10560,8 @@ _022C565C:
_022C5668: .word 0x0231F580
arm_func_end ov00_022C5628
arm_func_start FUN_022C566C
FUN_022C566C: ; 0x022C566C
arm_func_start ov00_022C566C
ov00_022C566C: ; 0x022C566C
ldr r0, _022C5690 ; =0x0231F580
mov r2, #0
str r2, [r0, #0x18]
@ -10574,7 +10574,7 @@ FUN_022C566C: ; 0x022C566C
.align 2, 0
_022C5690: .word 0x0231F580
_022C5694: .word ov00_022C5698
arm_func_end FUN_022C566C
arm_func_end ov00_022C566C
arm_func_start ov00_022C5698
ov00_022C5698: ; 0x022C5698
@ -12464,8 +12464,8 @@ _022C70D8: .word 0x0000FFFF
_022C70DC: .word 0x02318820
arm_func_end ov00_022C6EFC
arm_func_start FUN_022C70E0
FUN_022C70E0: ; 0x022C70E0
arm_func_start ov00_022C70E0
ov00_022C70E0: ; 0x022C70E0
ldr r3, _022C7148 ; =0x000001FE
cmp r0, r3
bhi _022C70F4
@ -12499,7 +12499,7 @@ _022C7114:
.align 2, 0
_022C7148: .word 0x000001FE
_022C714C: .word 0x000015E0
arm_func_end FUN_022C70E0
arm_func_end ov00_022C70E0
arm_func_start ov00_022C7150
ov00_022C7150: ; 0x022C7150
@ -12520,7 +12520,7 @@ _022C7184:
mov r0, r5
mov r2, r4
mov r1, #8
bl FUN_022C70E0
bl ov00_022C70E0
cmp r0, #0
bne _022C71AC
mov r0, r6
@ -12546,8 +12546,8 @@ _022C71AC:
_022C71E4: .word 0x02325020
arm_func_end ov00_022C7150
arm_func_start FUN_022C71E8
FUN_022C71E8: ; 0x022C71E8
arm_func_start ov00_022C71E8
ov00_022C71E8: ; 0x022C71E8
stmdb sp!, {r4, lr}
ldr r2, _022C72B8 ; =0x02325020
mov r3, #0
@ -12564,7 +12564,7 @@ FUN_022C71E8: ; 0x022C71E8
ldr r1, [r2, #8]
add r1, r1, #0x500
strh r3, [r1, #0x48]
bl FUN_022C7764
bl ov00_022C7764
ldr r4, _022C72B8 ; =0x02325020
ldr r0, [r4, #0xc]
add r0, r0, #0x1000
@ -12604,10 +12604,10 @@ _022C7290:
ldmdb sp!, {r4, pc}
.align 2, 0
_022C72B8: .word 0x02325020
arm_func_end FUN_022C71E8
arm_func_end ov00_022C71E8
arm_func_start FUN_022C72BC
FUN_022C72BC: ; 0x022C72BC
arm_func_start ov00_022C72BC
ov00_022C72BC: ; 0x022C72BC
stmdb sp!, {r4, r5, r6, lr}
mov r5, r0
bl EnableIrqFlag
@ -12644,7 +12644,7 @@ FUN_022C72BC: ; 0x022C72BC
ldr r0, [r0, #0xc]
add r0, r0, #0x138
add r0, r0, #0x1400
bl FUN_022C7E50
bl ov00_022C7E50
mov r5, #0
ldr r2, _022C748C ; =0x02325020
mov r0, r5
@ -12711,8 +12711,8 @@ _022C7360:
bic r1, r1, #0x1f
mov r1, r1, lsl #1
strh r1, [r0, #0x1a]
bl FUN_022C566C
bl FUN_022C71E8
bl ov00_022C566C
bl ov00_022C71E8
mov r5, r0
mov r0, r4
bl SetIrqFlag
@ -12731,12 +12731,12 @@ _022C7490: .word 0x000069C0
_022C7494: .word 0x00005D40
_022C7498: .word ov00_022C3510
_022C749C: .word ov00_022C5DA0
arm_func_end FUN_022C72BC
arm_func_end ov00_022C72BC
arm_func_start ov00_022C74A0
ov00_022C74A0: ; 0x022C74A0
ldr r1, _022C74BC ; =0x02325020
ldr ip, _022C74C0 ; =FUN_022C72BC
ldr ip, _022C74C0 ; =ov00_022C72BC
ldr r1, [r1, #0xc]
mov r2, #1
add r1, r1, #0x1000
@ -12744,7 +12744,7 @@ ov00_022C74A0: ; 0x022C74A0
bx ip
.align 2, 0
_022C74BC: .word 0x02325020
_022C74C0: .word FUN_022C72BC
_022C74C0: .word ov00_022C72BC
arm_func_end ov00_022C74A0
arm_func_start ov00_022C74C4
@ -12941,14 +12941,14 @@ _022C775C: .word 0x02325020
_022C7760: .word 0x000005D4
arm_func_end ov00_022C75D8
arm_func_start FUN_022C7764
FUN_022C7764: ; 0x022C7764
arm_func_start ov00_022C7764
ov00_022C7764: ; 0x022C7764
ldr r1, _022C7770 ; =0x02325020
strh r0, [r1, #0x26]
bx lr
.align 2, 0
_022C7770: .word 0x02325020
arm_func_end FUN_022C7764
arm_func_end ov00_022C7764
arm_func_start ov00_022C7774
ov00_022C7774: ; 0x022C7774
@ -13507,8 +13507,8 @@ ov00_022C7E20: ; 0x022C7E20
_022C7E4C: .word 0x02325064
arm_func_end ov00_022C7E20
arm_func_start FUN_022C7E50
FUN_022C7E50: ; 0x022C7E50
arm_func_start ov00_022C7E50
ov00_022C7E50: ; 0x022C7E50
ldr r3, _022C7E68 ; =0x02325064
ldr ip, _022C7E6C ; =sub_0207C40C
mov r1, #0
@ -13518,7 +13518,7 @@ FUN_022C7E50: ; 0x022C7E50
.align 2, 0
_022C7E68: .word 0x02325064
_022C7E6C: .word sub_0207C40C
arm_func_end FUN_022C7E50
arm_func_end ov00_022C7E50
arm_func_start ov00_022C7E70
ov00_022C7E70: ; 0x022C7E70
@ -57895,7 +57895,7 @@ _022EDD08:
b _022ED9D0
_022EDD10:
mov r0, #0x4000
blx FUN_02000088
blx sub_02000088
b _022ED9D0
_022EDD1C:
add sp, sp, #0x3c
@ -57950,7 +57950,7 @@ _022EDDA8:
cmp r0, #1
beq _022EDDD0
mov r0, r7
blx FUN_02000088
blx sub_02000088
b _022EDDA8
_022EDDD0:
mov r0, r4
@ -57993,7 +57993,7 @@ _022EDE34:
cmp r0, #1
ldmeqdb sp!, {r4, r5, r6, r7, r8, pc}
mov r0, r4
blx FUN_02000088
blx sub_02000088
b _022EDE34
_022EDE5C:
.byte 0xF0, 0x81, 0xBD, 0xE8
@ -58049,7 +58049,7 @@ _022EDEE8:
cmp r0, #1
beq _022EDF10
mov r0, r4
blx FUN_02000088
blx sub_02000088
b _022EDEE8
_022EDF10:
mov r0, #1

24
asm/overlay_02.s
View File

@ -11340,8 +11340,8 @@ _02330BF4:
.byte 0x09, 0xD0, 0x03, 0x20, 0x90, 0x47, 0x08, 0xBD, 0x04, 0x48, 0x02, 0x68, 0x00, 0x2A, 0x02, 0xD0
.byte 0x01, 0x20, 0x00, 0x21, 0x90, 0x47, 0x08, 0xBD, 0xD0, 0x94, 0x35, 0x02, 0x50, 0x95, 0x35, 0x02
thumb_func_start FUN_02330F00
FUN_02330F00: ; 0x02330F00
thumb_func_start ov02_02330F00
ov02_02330F00: ; 0x02330F00
push {r3, lr}
ldr r1, _02330F60 ; =0x023594D0
ldr r0, [r1, #0x2c]
@ -11395,7 +11395,7 @@ _02330F5A:
nop
_02330F60: .word 0x023594D0
_02330F64: .word 0x02330BF5
thumb_func_end FUN_02330F00
thumb_func_end ov02_02330F00
_02330F68:
.byte 0xF8, 0xB5, 0x05, 0x1C, 0x01, 0x20, 0x0F, 0x1C
.byte 0xA5, 0xF7, 0x8A, 0xEE, 0xA5, 0xF7, 0x5C, 0xEE, 0x06, 0x1C, 0x00, 0x2E, 0x10, 0xDD, 0x00, 0x24
@ -11421,8 +11421,8 @@ _02330F68:
.byte 0xC1, 0x62, 0x20, 0x1C, 0x4A, 0xF5, 0xA0, 0xEB, 0x01, 0x20, 0x10, 0xBD, 0x20, 0x1C, 0x4A, 0xF5
.byte 0x9C, 0xEB, 0x00, 0x20, 0x10, 0xBD, 0xC0, 0x46, 0xD0, 0x94, 0x35, 0x02
thumb_func_start FUN_023310CC
FUN_023310CC: ; 0x023310CC
thumb_func_start ov02_023310CC
ov02_023310CC: ; 0x023310CC
push {r4, lr}
blx EnableIrqFlag
add r4, r0, #0
@ -11446,7 +11446,7 @@ _023310EE:
mov r0, #1
pop {r4, pc}
_023310FE:
bl FUN_02330F00
bl ov02_02330F00
cmp r0, #1
bne _02331116
ldr r0, _02331120 ; =0x023594D0
@ -11463,7 +11463,7 @@ _02331116:
pop {r4, pc}
.align 2, 0
_02331120: .word 0x023594D0
thumb_func_end FUN_023310CC
thumb_func_end ov02_023310CC
_02331124:
.byte 0xF8, 0xB5, 0x07, 0x1C, 0x0D, 0x1C, 0x16, 0x1C, 0x4A, 0xF5, 0x5A, 0xEB
.byte 0x1C, 0x49, 0x04, 0x1C, 0x8E, 0x65, 0x00, 0x2D, 0x05, 0xD0, 0x89, 0x6A, 0x28, 0x1C, 0x60, 0x22
@ -11718,11 +11718,11 @@ _02331400: .word 0x00002490
_02331404: .word 0x02331329
thumb_func_end ov02_02331364
thumb_func_start FUN_02331408
FUN_02331408: ; 0x02331408
thumb_func_start ov02_02331408
ov02_02331408: ; 0x02331408
push {r3, r4, r5, r6, r7, lr}
mov r5, #1
bl FUN_023310CC
bl ov02_023310CC
cmp r0, #0
beq _02331446
mov r6, #0
@ -11767,7 +11767,7 @@ _02331458:
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0233145C: .word 0x023594D0
thumb_func_end FUN_02331408
thumb_func_end ov02_02331408
_02331460:
.byte 0xF8, 0xB5, 0x8C, 0xB0, 0x42, 0x48, 0x01, 0x24, 0xC3, 0x6D, 0x80, 0x69, 0xC0, 0x22, 0x01, 0x1C
.byte 0x51, 0x43, 0xE5, 0x1E, 0x5E, 0x18, 0x02, 0xD1, 0x0C, 0xB0, 0x00, 0x20, 0xF8, 0xBD, 0x30, 0x1C
@ -12692,7 +12692,7 @@ _02334350:
ldr r0, [r0, #0x74]
cmp r0, #0
ble _02334364
bl FUN_02331408
bl ov02_02331408
ldr r1, _0233436C ; =0x023594D0
mov r2, #0
str r2, [r1, #0x74]

666
asm/overlay_11.s
View File

File diff suppressed because it is too large Load Diff

424
asm/overlay_29.s
View File

File diff suppressed because it is too large Load Diff

1
main.lsf
View File

@ -9,7 +9,6 @@ Static main
{
Address 0x02000000
StackSize 0 2048
Object src/main.o
Object asm/main.o
### Vendor libraries ###