Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-09-30 14:18:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename file_rom.c functions

Browse Source
This commit is contained in:
ElectricGeorge
2023-12-28 14:08:33 -05:00
parent 7b2686518d
commit bae1a55289
7 changed files with 150 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
asm/include/main_0200C4CC.inc
View File

@@ -772,8 +772,8 @@
.public CLIENT_LEVEL_TABLE
.public COLLECTION_MENU_DEFAULT_WINDOW_PARAMS
.public CONTROLS_CHART_DEFAULT_WINDOW_PARAMS
.public DataTransferInit
.public DataTransferStop
.public FileRom_InitDataTransfer
.public FileRom_StopDataTransfer
.public DEBUG_MENU_DEFAULT_WINDOW_PARAMS
.public Debug_Print
.public Debug_Print0
@@ -801,10 +801,10 @@
.public FemaleToMaleForm
.public FileClose
.public FileGetSize
.public FileInitVeneer
.public FileOpen
.public FileRead
.public FileSeek
.public FileRom_Veneer_FileInit
.public FileRom_HandleOpen
.public FileRom_HandleRead
.public FileRom_HandleSeek
.public FORBIDDEN_FORGOT_MOVE_LIST
.public GAME_MODE
.public GET_ITEM_NAME_FORMATTED_SPRINTF

12
asm/include/overlay_11.inc
View File

@@ -54,8 +54,8 @@
.public CreateSimpleMenu
.public CreateSimpleMenuFromStringIds
.public CreateTextBox
.public DataTransferInit
.public DataTransferStop
.public FileRom_InitDataTransfer
.public FileRom_StopDataTransfer
.public Debug_Print
.public Debug_Print0
.public DecompressAtNormalVeneer
@@ -76,10 +76,10 @@
.public Debug_FatalError
.public FemaleToMaleForm
.public FileClose
.public FileInitVeneer
.public FileOpen
.public FileRead
.public FileSeek
.public FileRom_Veneer_FileInit
.public FileRom_HandleOpen
.public FileRom_HandleRead
.public FileRom_HandleSeek
.public FreeTeamStats
.public GenerateDailyMissions
.public GenerateKecleonItems1

48
asm/main_02000C6C.s
View File

@@ -4375,7 +4375,7 @@ _020041A4:
str r2, [sp, #0xc]
bl Debug_FatalError
_020041C4:
bl DataTransferInit
bl FileRom_InitDataTransfer
bl sub_0207A324
bl sub_0207A270
cmp r4, #0x24
@@ -4798,7 +4798,7 @@ _020047A0:
_020047B8:
add r0, sp, #0x10
bl InitOverlay
bl DataTransferStop
bl FileRom_StopDataTransfer
_020047C4:
add sp, sp, #0x3c
ldmia sp!, {r3, r4, pc}
@@ -4927,7 +4927,7 @@ _02004968:
str r2, [sp, #0xc]
bl Debug_FatalError
_02004988:
bl DataTransferInit
bl FileRom_InitDataTransfer
cmp r4, #0x24
addls pc, pc, r4, lsl #2
b _02004EAC
@@ -5303,7 +5303,7 @@ _02004EAC:
str r2, [sp, #4]
bl Debug_FatalError
_02004ECC:
bl DataTransferStop
bl FileRom_StopDataTransfer
_02004ED0:
add sp, sp, #0x10
ldmia sp!, {r4, pc}
@@ -8349,7 +8349,7 @@ sub_020075F4: ; 0x020075F4
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl DataTransferInit
bl FileRom_InitDataTransfer
mov r0, #2
str r0, [r5]
ldmia r5!, {r0, r1, r2, r3}
@@ -8371,7 +8371,7 @@ sub_02007624: ; 0x02007624
stmia ip!, {r0, r1, r2, r3}
ldmia lr, {r0, r1, r2}
stmia ip, {r0, r1, r2}
bl DataTransferStop
bl FileRom_StopDataTransfer
mov r0, #1
ldmia sp!, {r3, pc}
arm_func_end sub_02007624
@@ -9218,8 +9218,8 @@ _02008160:
ldmia sp!, {r3, pc}
arm_func_end sub_02008138
arm_func_start DataTransferInit
DataTransferInit: ; 0x02008168
arm_func_start FileRom_InitDataTransfer
FileRom_InitDataTransfer: ; 0x02008168
stmdb sp!, {r3, lr}
ldr r0, _0200818C ; =_020AF368
bl sub_02002CB4
@@ -9232,10 +9232,10 @@ DataTransferInit: ; 0x02008168
.align 2, 0
_0200818C: .word _020AF368
_02008190: .word _020AF360
arm_func_end DataTransferInit
arm_func_end FileRom_InitDataTransfer
arm_func_start DataTransferStop
DataTransferStop: ; 0x02008194
arm_func_start FileRom_StopDataTransfer
FileRom_StopDataTransfer: ; 0x02008194
stmdb sp!, {r4, lr}
ldr r1, _020081C0 ; =_020AF360
ldr r0, _020081C4 ; =_020AF368
@@ -9250,7 +9250,7 @@ DataTransferStop: ; 0x02008194
.align 2, 0
_020081C0: .word _020AF360
_020081C4: .word _020AF368
arm_func_end DataTransferStop
arm_func_end FileRom_StopDataTransfer
arm_func_start sub_020081C8
sub_020081C8: ; 0x020081C8
@@ -9282,16 +9282,16 @@ _020081FC: .word sub_02002E10
_02008200: .word _020AF368
arm_func_end sub_020081F0
arm_func_start FileInitVeneer
FileInitVeneer: ; 0x02008204
arm_func_start FileRom_Veneer_FileInit
FileRom_Veneer_FileInit: ; 0x02008204
ldr ip, _0200820C ; =FileInit
bx ip
.align 2, 0
_0200820C: .word FileInit
arm_func_end FileInitVeneer
arm_func_end FileRom_Veneer_FileInit
arm_func_start FileOpen
FileOpen: ; 0x02008210
arm_func_start FileRom_HandleOpen
FileRom_HandleOpen: ; 0x02008210
stmdb sp!, {r4, r5, r6, lr}
mov r6, r0
mov r5, r1
@@ -9305,7 +9305,7 @@ _02008220:
mov r0, r4
bl CardPullOutWithStatus
b _02008220
arm_func_end FileOpen
arm_func_end FileRom_HandleOpen
arm_func_start sub_02008240
sub_02008240: ; 0x02008240
@@ -9320,8 +9320,8 @@ FileGetSize: ; 0x02008244
bx lr
arm_func_end FileGetSize
arm_func_start FileRead
FileRead: ; 0x02008254
arm_func_start FileRom_HandleRead
FileRom_HandleRead: ; 0x02008254
stmdb sp!, {r4, r5, r6, r7, r8, lr}
mov r8, r0
mov r7, r1
@@ -9345,10 +9345,10 @@ _02008298:
bgt _02008270
mov r0, r5
ldmia sp!, {r4, r5, r6, r7, r8, pc}
arm_func_end FileRead
arm_func_end FileRom_HandleRead
arm_func_start FileSeek
FileSeek: ; 0x020082A8
arm_func_start FileRom_HandleSeek
FileRom_HandleSeek: ; 0x020082A8
stmdb sp!, {r3, lr}
bl sub_0207F828
cmp r0, #0
@@ -9356,7 +9356,7 @@ FileSeek: ; 0x020082A8
mov r0, #1
bl CardPullOutWithStatus
ldmia sp!, {r3, pc}
arm_func_end FileSeek
arm_func_end FileRom_HandleSeek
arm_func_start FileClose
FileClose: ; 0x020082C4

118
asm/main_0200C4CC.s
View File

@@ -16806,12 +16806,12 @@ sub_02019314: ; 0x02019314
sub sp, sp, #0x48
mov r5, r0
mov r4, r1
bl DataTransferInit
bl FileRom_InitDataTransfer
add r0, sp, #0
bl FileInitVeneer
bl FileRom_Veneer_FileInit
add r0, sp, #0
mov r1, r4
bl FileOpen
bl FileRom_HandleOpen
add r0, sp, #0
bl FileGetSize
str r0, [r5, #4]
@@ -16823,11 +16823,11 @@ sub_02019314: ; 0x02019314
str r0, [r5]
add r0, sp, #0
ldmia r5, {r1, r2}
bl FileRead
bl FileRom_HandleRead
mov r4, r0
add r0, sp, #0
bl FileClose
bl DataTransferStop
bl FileRom_StopDataTransfer
mov r0, r4
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, pc}
@@ -16841,12 +16841,12 @@ LoadDseFile: ; 0x0201938C
sub sp, sp, #0x48
mov r5, r0
mov r4, r1
bl DataTransferInit
bl FileRom_InitDataTransfer
add r0, sp, #0
bl FileInitVeneer
bl FileRom_Veneer_FileInit
add r0, sp, #0
mov r1, r4
bl FileOpen
bl FileRom_HandleOpen
add r0, sp, #0
bl FileGetSize
str r0, [r5, #4]
@@ -16858,11 +16858,11 @@ LoadDseFile: ; 0x0201938C
str r0, [r5]
add r0, sp, #0
ldmia r5, {r1, r2}
bl FileRead
bl FileRom_HandleRead
mov r4, r0
add r0, sp, #0
bl FileClose
bl DataTransferStop
bl FileRom_StopDataTransfer
mov r0, r4
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, pc}
@@ -17316,7 +17316,7 @@ _02019970:
str r0, [r1, #0x2c]
ldr r0, _02019B00 ; =_020AFB28
bl sub_02002E98
bl DataTransferInit
bl FileRom_InitDataTransfer
bl sub_02003AB0
ldr r0, _02019B08 ; =_022A4E58
ldr r2, [r0, #4]
@@ -17329,7 +17329,7 @@ _02019A5C:
bl sub_0206D30C
cmp r0, #0
bne _02019A5C
bl DataTransferStop
bl FileRom_StopDataTransfer
ldr r0, _02019B00 ; =_020AFB28
bl sub_02002CB4
ldr r0, _02019B08 ; =_022A4E58
@@ -17662,7 +17662,7 @@ _02019E3C:
str r0, [r1, #0x54]
ldr r0, _02019FC0 ; =_020AFB28
bl sub_02002E98
bl DataTransferInit
bl FileRom_InitDataTransfer
bl sub_02003AB0
ldr r0, _02019FC8 ; =_022A4E58
ldr r2, [r0, #0xc]
@@ -17675,7 +17675,7 @@ _02019F1C:
bl sub_0206D30C
cmp r0, #0
bne _02019F1C
bl DataTransferStop
bl FileRom_StopDataTransfer
ldr r0, _02019FC0 ; =_020AFB28
bl sub_02002CB4
ldr r0, _02019FC8 ; =_022A4E58
@@ -32203,28 +32203,28 @@ GetStringFromFile: ; 0x02025788
sub sp, sp, #8
mov r4, r1
mov r5, r0
bl DataTransferInit
bl FileRom_InitDataTransfer
sub r0, r4, #1
mov r1, r0, lsl #0x10
ldr r0, _020257F8 ; =_022A59C0
mov r1, r1, lsr #0xe
mov r2, #0
bl FileSeek
bl FileRom_HandleSeek
ldr r0, _020257F8 ; =_022A59C0
add r1, sp, #0
mov r2, #8
bl FileRead
bl FileRom_HandleRead
ldr r1, [sp]
ldr r0, _020257F8 ; =_022A59C0
mov r2, #0
bl FileSeek
bl FileRom_HandleSeek
ldr r3, [sp, #4]
ldr r2, [sp]
ldr r0, _020257F8 ; =_022A59C0
mov r1, r5
sub r2, r3, r2
bl FileRead
bl DataTransferStop
bl FileRom_HandleRead
bl FileRom_StopDataTransfer
add sp, sp, #8
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
@@ -32252,7 +32252,7 @@ LoadStringFile: ; 0x02025818
ldrsb r0, [r1]
cmp r0, r4
ldmeqia sp!, {r4, pc}
bl DataTransferInit
bl FileRom_InitDataTransfer
ldr r1, _0202587C ; =_020AFCEC
mvn r0, #0
ldrsb r1, [r1]
@@ -32264,12 +32264,12 @@ _02025854:
ldr r1, _0202587C ; =_020AFCEC
ldr r0, _02025880 ; =_022A59C0
strb r4, [r1]
bl FileInitVeneer
bl FileRom_Veneer_FileInit
ldr r1, _02025884 ; =_020AFCF0
ldr r0, _02025880 ; =_022A59C0
ldr r1, [r1, r4, lsl #2]
bl FileOpen
bl DataTransferStop
bl FileRom_HandleOpen
bl FileRom_StopDataTransfer
ldmia sp!, {r4, pc}
.align 2, 0
_0202587C: .word _020AFCEC
@@ -32347,21 +32347,21 @@ CopyNStringFromId: ; 0x0202590C
arm_func_start LoadTblTalk
LoadTblTalk: ; 0x0202593C
stmdb sp!, {r3, lr}
bl DataTransferInit
bl FileRom_InitDataTransfer
ldr r0, _02025980 ; =_022A7A0C
bl FileInitVeneer
bl FileRom_Veneer_FileInit
ldr r0, _02025980 ; =_022A7A0C
ldr r1, _02025984 ; =_0209AAD8
bl FileOpen
bl FileRom_HandleOpen
ldr r0, _02025980 ; =_022A7A0C
mov r1, #0x33c
mov r2, #0
bl FileSeek
bl FileRom_HandleSeek
ldr r0, _02025980 ; =_022A7A0C
ldr r1, _02025988 ; =_022A7A08
mov r2, #2
bl FileRead
bl DataTransferStop
bl FileRom_HandleRead
bl FileRom_StopDataTransfer
ldmia sp!, {r3, pc}
.align 2, 0
_02025980: .word _022A7A0C
@@ -32384,21 +32384,21 @@ GetTalkLine: ; 0x0202598C
cmp r4, #2
moveq r4, #0
_020259BC:
bl DataTransferInit
bl FileRom_InitDataTransfer
ldr r1, _02025AC8 ; =_022A7A08
ldr r0, _02025ACC ; =_022A7A0C
ldrsh r1, [r1]
mov r2, #0
add r1, r1, r6
bl FileSeek
bl FileRom_HandleSeek
ldr r0, _02025ACC ; =_022A7A0C
add r1, sp, #0
mov r2, #1
bl FileRead
bl FileRom_HandleRead
ldrsb r2, [sp]
cmp r2, #0
bge _02025A00
bl DataTransferStop
bl FileRom_StopDataTransfer
ldr r0, _02025AD0 ; =0x00003EFD
b _02025ABC
_02025A00:
@@ -32407,26 +32407,26 @@ _02025A00:
ldr r0, _02025ACC ; =_022A7A0C
mov r1, r1, lsl #1
mov r2, #0
bl FileSeek
bl FileRom_HandleSeek
ldr r0, _02025ACC ; =_022A7A0C
add r1, sp, #2
mov r2, #4
bl FileRead
bl FileRom_HandleRead
ldrsh r1, [sp, #2]
ldrsh r0, [sp, #4]
subs r6, r0, r1
bne _02025A44
bl DataTransferStop
bl FileRom_StopDataTransfer
ldr r0, _02025AD0 ; =0x00003EFD
b _02025ABC
_02025A44:
ldr r0, _02025ACC ; =_022A7A0C
mov r2, #0
bl FileSeek
bl FileRom_HandleSeek
ldr r0, _02025ACC ; =_022A7A0C
add r1, sp, #6
mov r2, r6
bl FileRead
bl FileRom_HandleRead
cmp r4, #1
bne _02025A78
mov r0, #2
@@ -32441,7 +32441,7 @@ _02025A78:
bl RandInt
mov r4, r0
_02025A90:
bl DataTransferStop
bl FileRom_StopDataTransfer
ldr r2, _02025AD4 ; =TBL_TALK_GROUP_STRING_ID_START
mov r3, r5, lsl #1
add r0, sp, #6
@@ -38348,21 +38348,21 @@ sub_0202A45C: ; 0x0202A45C
mov sb, r2
mov r8, r3
ldr r7, [sp, #0x90]
bl DataTransferInit
bl FileRom_InitDataTransfer
add r0, sp, #0x28
bl FileInitVeneer
bl FileRom_Veneer_FileInit
ldr r1, _0202A5C0 ; =_020AFDAC
add r0, sp, #0x28
ldr r1, [r1, sl, lsl #2]
bl FileOpen
bl FileRom_HandleOpen
mov r1, r4, lsl #3
add r0, sp, #0x28
mov r2, #0
bl FileSeek
bl FileRom_HandleSeek
add r0, sp, #0x28
add r1, sp, #8
mov r2, #0x10
bl FileRead
bl FileRom_HandleRead
ldr r6, [sp, #8]
ldr r1, [sp, #0x10]
mov r0, r6
@@ -38378,15 +38378,15 @@ sub_0202A45C: ; 0x0202A45C
add r0, sp, #0x28
mov r1, r6
mov r2, #0
bl FileSeek
bl FileRom_HandleSeek
add r0, sp, #0x28
mov r1, r5
mov r2, r4
bl FileRead
bl FileRom_HandleRead
_0202A504:
add r0, sp, #0x28
bl FileClose
bl DataTransferStop
bl FileRom_StopDataTransfer
cmp sl, #2
ldreq r0, _0202A5C4 ; =_0209AE44
add r4, sp, #0x18
@@ -80932,10 +80932,10 @@ CopyProgressInfoFromScratchFrom: ; 0x0204D748
arm_func_start InitKaomadoStream
InitKaomadoStream: ; 0x0204D780
stmdb sp!, {r3, lr}
bl DataTransferInit
bl FileRom_InitDataTransfer
ldr r0, _0204D798 ; =_022AB4B0
bl FileInitVeneer
bl DataTransferStop
bl FileRom_Veneer_FileInit
bl FileRom_StopDataTransfer
ldmia sp!, {r3, pc}
.align 2, 0
_0204D798: .word _022AB4B0
@@ -81051,10 +81051,10 @@ LoadPortrait: ; 0x0204D8BC
mov sb, r1
ldrsh r7, [sl]
ldrsb r8, [sl, #2]
bl DataTransferInit
bl FileRom_InitDataTransfer
ldr r0, _0204DA14 ; =_022AB4B0
ldr r1, _0204DA18 ; =KAOMADO_FILEPATH
bl FileOpen
bl FileRom_HandleOpen
mov fp, #0
mov r4, fp
mov r5, #1
@@ -81067,11 +81067,11 @@ _0204D8F4:
ldr r0, _0204DA14 ; =_022AB4B0
mov r2, #0
sub r7, r7, #0x258
bl FileSeek
bl FileRom_HandleSeek
ldr r0, _0204DA14 ; =_022AB4B0
add r1, sp, #0
mov r2, #0xc
bl FileRead
bl FileRom_HandleRead
ldr r0, [sp, #4]
cmp r0, #0
movge r0, #1
@@ -81111,15 +81111,15 @@ _0204D99C:
beq _0204D9C8
ldr r0, _0204DA14 ; =_022AB4B0
mov r2, #0
bl FileSeek
bl FileRom_HandleSeek
ldr r0, _0204DA14 ; =_022AB4B0
mov r1, sb
mov r2, r6
bl FileRead
bl FileRom_HandleRead
_0204D9C8:
ldr r0, _0204DA14 ; =_022AB4B0
bl FileClose
bl DataTransferStop
bl FileRom_StopDataTransfer
mov r0, #1
b _0204DA0C
_0204D9DC:
@@ -81133,7 +81133,7 @@ _0204D9DC:
bne _0204D9DC
ldr r0, _0204DA14 ; =_022AB4B0
bl FileClose
bl DataTransferStop
bl FileRom_StopDataTransfer
mov r0, #0
_0204DA0C:
add sp, sp, #0xc

58
asm/overlay_11.s
View File

@@ -9491,12 +9491,12 @@ SsbLoad2: ; 0x022E46FC
mov r2, r4
mov r0, #2
bl Debug_Print
bl DataTransferInit
bl FileRom_InitDataTransfer
add r0, sp, #0xc + SSB_LOAD_2_STACK_OFFSET
bl FileInitVeneer
bl FileRom_Veneer_FileInit
add r0, sp, #0xc + SSB_LOAD_2_STACK_OFFSET
mov r1, r4
bl FileOpen
bl FileRom_HandleOpen
add r0, sp, #0xc + SSB_LOAD_2_STACK_OFFSET
add r1, sp, #0
#ifdef EUROPE
@@ -9504,7 +9504,7 @@ SsbLoad2: ; 0x022E46FC
#else
mov r2, #0xc
#endif
bl FileRead
bl FileRom_HandleRead
ldrh r3, [sp, #4]
ldrh r2, [sp, #6]
ldr r0, _022E48A8 ; =ov11_02324F70
@@ -9529,7 +9529,7 @@ _022E4790:
ldr r1, [r5]
add r0, sp, #0xc + SSB_LOAD_2_STACK_OFFSET
mov r2, r2, lsl #1
bl FileRead
bl FileRom_HandleRead
ldrh r0, [sp]
cmp r0, #0
beq _022E47D4
@@ -9541,7 +9541,7 @@ _022E4790:
add r0, sp, #0xc + SSB_LOAD_2_STACK_OFFSET
add r1, r3, r1, lsl #1
mov r2, r2, lsl #1
bl FileRead
bl FileRom_HandleRead
_022E47D4:
ldrh r0, [sp, #2]
cmp r0, #0
@@ -9570,14 +9570,14 @@ _022E4814:
mov r1, r2, lsl #1
add r0, sp, #0xc + SSB_LOAD_2_STACK_OFFSET
mov r2, #0
bl FileSeek
bl FileRom_HandleSeek
ldrh r2, [sp, #2]
ldrh r1, [sp, #4]
ldr r3, [r5]
add r0, sp, #0xc + SSB_LOAD_2_STACK_OFFSET
add r1, r3, r1, lsl #1
mov r2, r2, lsl #1
bl FileRead
bl FileRom_HandleRead
ldr r0, _022E48A8 ; =ov11_02324F70
add r1, sp, #0
ldrsb r0, [r0]
@@ -9594,11 +9594,11 @@ _022E4814:
add r0, sp, #0xc + SSB_LOAD_2_STACK_OFFSET
add r1, r5, r1, lsl #1
mov r2, r2, lsl #1
bl FileRead
bl FileRom_HandleRead
_022E488C:
add r0, sp, #0xc + SSB_LOAD_2_STACK_OFFSET
bl FileClose
bl DataTransferStop
bl FileRom_StopDataTransfer
mov r0, r4
add sp, sp, #0x54 + SSB_LOAD_2_STACK_OFFSET
ldmia sp!, {r4, r5, pc}
@@ -11159,12 +11159,12 @@ SsbLoad1: ; 0x022E5D50
mov r2, r5
mov r0, #2
bl Debug_Print
bl DataTransferInit
bl FileRom_InitDataTransfer
add r0, sp, #0xc + SSB_LOAD_1_STACK_OFFSET
bl FileInitVeneer
bl FileRom_Veneer_FileInit
add r0, sp, #0xc + SSB_LOAD_1_STACK_OFFSET
mov r1, r5
bl FileOpen
bl FileRom_HandleOpen
add r0, sp, #0xc + SSB_LOAD_1_STACK_OFFSET
add r1, sp, #0
#ifdef EUROPE
@@ -11172,7 +11172,7 @@ SsbLoad1: ; 0x022E5D50
#else
mov r2, #0xc
#endif
bl FileRead
bl FileRom_HandleRead
ldrh r3, [sp, #4]
ldrh r2, [sp, #6]
ldr r0, _022E5EF8 ; =ov11_02324F74
@@ -11196,7 +11196,7 @@ _022E5DE0:
ldr r1, [r4]
add r0, sp, #0xc + SSB_LOAD_1_STACK_OFFSET
mov r2, r2, lsl #1
bl FileRead
bl FileRom_HandleRead
ldrh r0, [sp]
cmp r0, #0
beq _022E5E24
@@ -11208,7 +11208,7 @@ _022E5DE0:
add r0, sp, #0xc + SSB_LOAD_1_STACK_OFFSET
add r1, r3, r1, lsl #1
mov r2, r2, lsl #1
bl FileRead
bl FileRom_HandleRead
_022E5E24:
ldrh r0, [sp, #2]
cmp r0, #0
@@ -11237,14 +11237,14 @@ _022E5E64:
mov r1, r2, lsl #1
add r0, sp, #0xc + SSB_LOAD_1_STACK_OFFSET
mov r2, #0
bl FileSeek
bl FileRom_HandleSeek
ldrh r2, [sp, #2]
ldrh r1, [sp, #4]
ldr r3, [r4]
add r0, sp, #0xc + SSB_LOAD_1_STACK_OFFSET
add r1, r3, r1, lsl #1
mov r2, r2, lsl #1
bl FileRead
bl FileRom_HandleRead
ldr r0, _022E5EF8 ; =ov11_02324F74
add r1, sp, #0
ldrsb r0, [r0, #1]
@@ -11261,11 +11261,11 @@ _022E5E64:
add r0, sp, #0xc + SSB_LOAD_1_STACK_OFFSET
add r1, r4, r1, lsl #1
mov r2, r2, lsl #1
bl FileRead
bl FileRom_HandleRead
_022E5EDC:
add r0, sp, #0xc + SSB_LOAD_1_STACK_OFFSET
bl FileClose
bl DataTransferStop
bl FileRom_StopDataTransfer
mov r0, #1
add sp, sp, #0x54 + SSB_LOAD_1_STACK_OFFSET
ldmia sp!, {r4, r5, pc}
@@ -18325,33 +18325,33 @@ LoadBackgroundAttributes: ; 0x022EBB40
sub sp, sp, #0x48
mov sl, r0
mov r4, r1
bl DataTransferInit
bl FileRom_InitDataTransfer
add r0, sp, #0
bl FileInitVeneer
bl FileRom_Veneer_FileInit
ldr r1, _022EBC14 ; =ov11_02320C44
add r0, sp, #0
bl FileOpen
bl FileRom_HandleOpen
mov r0, #0x58
mul r1, r4, r0
add r0, sp, #0
mov r2, #0
bl FileSeek
bl FileRom_HandleSeek
add r0, sp, #0
mov r1, sl
mov r2, #8
bl FileRead
bl FileRom_HandleRead
mov r0, #0
strb r0, [sl, #8]
add r0, sp, #0
add r1, sl, #0xa
mov r2, #8
bl FileRead
bl FileRom_HandleRead
mov r0, #0
strb r0, [sl, #0x12]
add r0, sp, #0
add r1, sl, #0x14
mov r2, #8
bl FileRead
bl FileRom_HandleRead
mov r8, #0
strb r8, [sl, #0x1c]
add r6, sl, #0x1e
@@ -18364,7 +18364,7 @@ _022EBBD8:
mov r0, r7
mov r2, fp
add r1, r6, sb
bl FileRead
bl FileRom_HandleRead
add r0, sl, sb
add r8, r8, #1
strb r5, [r0, #0x26]
@@ -18372,7 +18372,7 @@ _022EBBD8:
blt _022EBBD8
add r0, sp, #0
bl FileClose
bl DataTransferStop
bl FileRom_StopDataTransfer
add sp, sp, #0x48
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0

14
include/file_rom.h Normal file
View File

@@ -0,0 +1,14 @@
#ifndef PMDSKY_FILE_ROM_H
#define PMDSKY_FILE_ROM_H
#include <file.h>
extern void FileRom_InitDataTransfer(void);
extern void FileRom_StopDataTransfer(void);
extern void FileRom_Veneer_FileInit(struct file_stream* file);
extern void FileRom_HandleOpen(struct file_stream* file, const char* filepath);
extern u32 FileRom_HandleRead(struct file_stream* file, void* buf, u32 size);
extern void FileRom_HandleSeek(struct file_stream* file, int offset, int whence);
#endif

30
src/directory_file.c
View File

@@ -1,12 +1,6 @@
#include "directory_file.h"
extern void DataTransferInit(void);
extern void DataTransferStop(void);
extern void FileSeek(struct file_stream* file, int offset, int whence);
extern u32 FileRead(struct file_stream* file, void* buf, u32 size);
extern void FileInitVeneer(struct file_stream* file);
extern void FileOpen(struct file_stream* file, const char* filepath);
#include "file_rom.h"
#include "debug.h"
extern void* MemAlloc(u32 len, u32 flags);
@@ -15,18 +9,18 @@ extern char STRING_FILE_DIRECTORY_INIT;
void DirectoryFile_ExtractDirectoryFile(struct directory *pack_file, char *file_path) {
DataTransferInit();
FileInitVeneer(&pack_file->opened_file);
FileOpen(&pack_file->opened_file,file_path);
FileRead(&pack_file->opened_file,&pack_file->zero,8);
FileSeek(&pack_file->opened_file,8,0);
FileRom_InitDataTransfer();
FileRom_Veneer_FileInit(&pack_file->opened_file);
FileRom_HandleOpen(&pack_file->opened_file,file_path);
FileRom_HandleRead(&pack_file->opened_file,&pack_file->zero,8);
FileRom_HandleSeek(&pack_file->opened_file,8,0);
u32 toc_total_size = pack_file->nb_entry_table_of_content * sizeof(struct directory_entry);
struct directory_entry *toc_alloc = (struct directory_entry *) MemAlloc(toc_total_size, 0);
pack_file->table_of_content = toc_alloc;
FileRead(&pack_file->opened_file,pack_file->table_of_content,toc_total_size);
FileRom_HandleRead(&pack_file->opened_file,pack_file->table_of_content,toc_total_size);
Debug_Print0(&STRING_FILE_DIRECTORY_INIT,pack_file->zero,
pack_file->nb_entry_table_of_content,toc_total_size,file_path);
DataTransferStop();
FileRom_StopDataTransfer();
return;
}
@@ -36,10 +30,10 @@ u32 DirectoryFile_GetDirectoryFileSize(struct directory* pack_file, u32 file_ind
}
u32 DirectoryFile_LoadDirectoryFile(struct directory *pack_file,void *output_buffer,u32 file_index) {
DataTransferInit();
FileRom_InitDataTransfer();
struct directory_entry *toc_entry = &pack_file->table_of_content[file_index];
FileSeek(&pack_file->opened_file,toc_entry->offset,0);
FileRead(&pack_file->opened_file,output_buffer,toc_entry->length);
DataTransferStop();
FileRom_HandleSeek(&pack_file->opened_file,toc_entry->offset,0);
FileRom_HandleRead(&pack_file->opened_file,output_buffer,toc_entry->length);
FileRom_StopDataTransfer();
return toc_entry->length;
}