Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-10-01 06:37:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Defined pointers for overlay 25

Browse Source
This commit is contained in:
AnonymousRandomPerson
2023-09-18 23:19:36 -04:00
parent 28bbd519ee
commit 69bc0c54fe
2 changed files with 112 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
asm/include/overlay_25.inc
View File

@@ -1,55 +1,55 @@
#pragma once
.public sub_0202E6E4
.public ov11_0230BCF8
.public CreatePortraitBox
.public CreateNormalMenu
.public sub_02017C80
.public sub_0202E6C8
.public AddItemToBagNoHeld
.public AddMoneyCarried
.public CreateDBox
.public sub_0200D670
.public ov11_0230C910
.public sub_0202F8FC
.public sub_02027B1C
.public PreprocessString
.public SetPortraitLayout
.public CreateNormalMenu
.public CreatePortraitBox
.public FreeDBox
.public FreeNormalMenu
.public FreePortraitBox
.public GetGold
.public GetNbItemsInBag
.public GetNormalMenuResult
.public GetPressedButtons
.public HidePortraitBox
.public ov11_0230B8C0
.public sub_0200D0A0
.public sub_02026214
.public GetNbItemsInBag
.public ov11_0230B20C
.public ShowPortraitBox
.public RemoveItemByIdAndStackNoHole
.public IsDBoxActive
.public ov11_0230BA64
.public ShowMessageInDBox
.public ov11_0230B9BC
.public sub_02017C74
.public sub_0202E3CC
.public MemAlloc
.public sub_0202F2C4
.public InitPortraitBoxWithMonsterId
.public ov11_0230BD28
.public GetNormalMenuResult
.public SetPortraitEmotion
.public ShowDBox
.public sub_0202F8C4
.public sub_02026268
.public IsThrownItem
.public ov11_022DC504
.public MemFree
.public sub_0202F918
.public AddItemToBagNoHeld
.public GetGold
.public AddMoneyCarried
.public InitPreprocessorArgs
.public sub_02027AF0
.public FreeNormalMenu
.public sub_0202836C
.public ov11_0230B724
.public FreePortraitBox
.public FreeDBox
.public ov11_022E6E8C
.public IsDBoxActive
.public IsThrownItem
.public MemAlloc
.public MemFree
.public ov11_022DC504
.public ov11_022E6E68
.public ov11_022E6E8C
.public ov11_022E6EC8
.public ov11_0230B20C
.public ov11_0230B724
.public ov11_0230B8C0
.public ov11_0230B9BC
.public ov11_0230BA64
.public ov11_0230BCF8
.public ov11_0230BD28
.public ov11_0230C910
.public PreprocessString
.public RemoveItemByIdAndStackNoHole
.public SetPortraitEmotion
.public SetPortraitLayout
.public ShowDBox
.public ShowMessageInDBox
.public ShowPortraitBox
.public sub_0200D0A0
.public sub_0200D670
.public sub_02017C74
.public sub_02017C80
.public sub_02026214
.public sub_02026268
.public sub_02027AF0
.public sub_02027B1C
.public sub_0202836C
.public sub_0202E3CC
.public sub_0202E6C8
.public sub_0202E6E4
.public sub_0202F2C4
.public sub_0202F8C4
.public sub_0202F8FC
.public sub_0202F918

98
asm/overlay_25.s
View File

@@ -473,16 +473,16 @@ _0238A734:
bl ShowPortraitBox
b _0238B0C8
_0238A7E4:
ldr r0, _0238B0DC ; =0x0238B4A4
ldr r0, _0238B0DC ; =ov25_0238B4A4
ldr r1, _0238B0E0 ; =ov25_0238B414
bl sub_0202F8C4
ldr r2, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0E4 ; =0x00300013
ldr r2, [r2]
ldr r3, _0238B0E8 ; =0x0238B4CC
ldr r3, _0238B0E8 ; =ov25_0238B4CC
strb r0, [r2, #0x13d]
mov ip, #4
ldr r0, _0238B0EC ; =0x0238B564
ldr r0, _0238B0EC ; =ov25_0238B564
mov r2, #0
str ip, [sp]
bl CreateNormalMenu
@@ -850,8 +850,8 @@ _0238AD48:
b _0238B0C8
_0238AD8C:
mov r2, #0x96
ldr r0, _0238B104 ; =0x0238B574
ldr r3, _0238B108 ; =0x0238B4EC
ldr r0, _0238B104 ; =ov25_0238B574
ldr r3, _0238B108 ; =ov25_0238B4EC
str r2, [r1, #0x4c]
mov ip, #3
mov r1, #0x13
@@ -864,7 +864,7 @@ _0238AD8C:
b _0238B0C8
_0238ADC0:
ldrh r0, [r1, #0xe]
ldr r2, _0238B10C ; =0x0238B5A4
ldr r2, _0238B10C ; =ov25_0238B5A4
ldr r3, _0238B110 ; =0x0000C402
str r0, [r1, #0x28]
ldr lr, [ip]
@@ -888,7 +888,7 @@ ov25_0238ADFC: ; 0x0238ADFC
ldr r0, _0238B0D0 ; =ov25_0238B5E0
add r1, sp, #0x18
ldr ip, [r0]
ldr r0, _0238B114 ; =0x0238B594
ldr r0, _0238B114 ; =ov25_0238B594
add r2, ip, #0x78
str r2, [sp, #0x50]
str r1, [sp]
@@ -945,15 +945,15 @@ _0238AE64:
bl ShowMessageInDBox
b _0238B0C8
_0238AEF0:
ldr r0, _0238B0DC ; =0x0238B4A4
ldr r0, _0238B0DC ; =ov25_0238B4A4
ldr r1, _0238B0E0 ; =ov25_0238B414
bl sub_0202F8C4
ldr r1, _0238B0D0 ; =ov25_0238B5E0
ldr r3, _0238B120 ; =0x0238B4B4
ldr r3, _0238B120 ; =ov25_0238B4B4
ldr r1, [r1]
mov ip, #2
strb r0, [r1, #0x13d]
ldr r0, _0238B124 ; =0x0238B584
ldr r0, _0238B124 ; =ov25_0238B584
mov r1, #0x80000013
mov r2, #0
str ip, [sp]
@@ -1036,7 +1036,7 @@ _0238B00C:
add r1, sp, #0xc
str r3, [r2, #0x24]
ldr r0, [r0]
ldr r2, _0238B12C ; =0x0238B498
ldr r2, _0238B12C ; =ov25_0238B498
add r0, r0, #0xb8
bl sub_0200D670
ldr r0, _0238B0D0 ; =ov25_0238B5E0
@@ -1076,27 +1076,27 @@ _0238B0C8:
_0238B0D0: .word ov25_0238B5E0
_0238B0D4: .word 0x00003008
_0238B0D8: .word 0x000003D7
_0238B0DC: .word 0x0238B4A4
_0238B0DC: .word ov25_0238B4A4
_0238B0E0: .word ov25_0238B414
_0238B0E4: .word 0x00300013
_0238B0E8: .word 0x0238B4CC
_0238B0EC: .word 0x0238B564
_0238B0E8: .word ov25_0238B4CC
_0238B0EC: .word ov25_0238B564
_0238B0F0: .word 0x000003DD
_0238B0F4: .word 0x00003018
_0238B0F8: .word 0x000003E5
_0238B0FC: .word 0x000003D9
_0238B100: .word 0x000003DF
_0238B104: .word 0x0238B574
_0238B108: .word 0x0238B4EC
_0238B10C: .word 0x0238B5A4
_0238B104: .word ov25_0238B574
_0238B108: .word ov25_0238B4EC
_0238B10C: .word ov25_0238B5A4
_0238B110: .word 0x0000C402
_0238B114: .word 0x0238B594
_0238B114: .word ov25_0238B594
_0238B118: .word 0x00001013
_0238B11C: .word 0x0000033E
_0238B120: .word 0x0238B4B4
_0238B124: .word 0x0238B584
_0238B120: .word ov25_0238B4B4
_0238B124: .word ov25_0238B584
_0238B128: .word 0x0000018F
_0238B12C: .word 0x0238B498
_0238B12C: .word ov25_0238B498
_0238B130: .word 0x000003E1
arm_func_end ov25_0238ADFC
@@ -1326,7 +1326,7 @@ ov25_0238B414: ; 0x0238B414
add ip, sp, #0x400
str r0, [sp, #0x428]
add ip, ip, #4
ldr r2, _0238B48C ; =0x0238B5B0
ldr r2, _0238B48C ; =ov25_0238B5B0
ldr r3, _0238B490 ; =0x0000C402
add r0, sp, #4
mov r1, #0x100
@@ -1348,30 +1348,62 @@ ov25_0238B414: ; 0x0238B414
add sp, sp, #0x400
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0238B48C: .word 0x0238B5B0
_0238B48C: .word ov25_0238B5B0
_0238B490: .word 0x0000C402
_0238B494: .word 0x00000225
arm_func_end ov25_0238B414
; 0x0238B498
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x02, 0x08, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD1, 0x03, 0x00, 0x00
.global ov25_0238B498
ov25_0238B498:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global ov25_0238B4A4
ov25_0238B4A4:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x02, 0x08, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov25_0238B4B4
ov25_0238B4B4:
.byte 0xD1, 0x03, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00, 0xD2, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0xD3, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD5, 0x03, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00
.global ov25_0238B4CC
ov25_0238B4CC:
.byte 0xD3, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD5, 0x03, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00, 0xD6, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0xDA, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD5, 0x03, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00
.global ov25_0238B4EC
ov25_0238B4EC:
.byte 0xDA, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD5, 0x03, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00, 0xE6, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0xD3, 0x03, 0xD4, 0x03, 0xD5, 0x03, 0xD6, 0x03, 0xD7, 0x03, 0xD8, 0x03
.byte 0xD9, 0x03, 0xDA, 0x03, 0xDB, 0x03, 0xDC, 0x03, 0xDD, 0x03, 0xDE, 0x03, 0xDF, 0x03, 0xE0, 0x03
.byte 0xE1, 0x03, 0xE4, 0x03, 0xE5, 0x03, 0xE2, 0x03, 0xE3, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x02, 0x12, 0x10, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x0A, 0x08, 0x03, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x0F, 0x08, 0x03, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x02, 0x08, 0x05, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x18, 0x0B, 0x06, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x69, 0x74, 0x65
.byte 0x6D, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x43, 0x53, 0x3A, 0x56, 0x5D, 0x5B, 0x67
.byte 0x16, 0x0F, 0x08, 0x03, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov25_0238B564
ov25_0238B564:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov25_0238B574
ov25_0238B574:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x02, 0x08, 0x05, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov25_0238B584
ov25_0238B584:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x18, 0x0B, 0x06, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov25_0238B594
ov25_0238B594:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov25_0238B5A4
ov25_0238B5A4:
.byte 0x5B, 0x69, 0x74, 0x65
.byte 0x6D, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00, 0x00
.global ov25_0238B5B0
ov25_0238B5B0:
.byte 0x5B, 0x43, 0x53, 0x3A, 0x56, 0x5D, 0x5B, 0x67
.byte 0x6F, 0x6C, 0x64, 0x3A, 0x30, 0x5D, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00
.data