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

Decomp LoadScriptVariableValueString

Browse Source
This commit is contained in:
slaw-22
2025-10-28 16:12:23 +00:00
parent d9b62fde05
commit 3e51dd969a
7 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/main_02014D18.inc
View File

@@ -439,7 +439,7 @@
.public sub_0200D310
.public sub_02025480
.public sub_020257FC
.public sub_0204BBB0
.public LoadScriptVariableValueString
.public sub_0204E530
.public sub_0204F6F8
.public sub_0204F77C

1
asm/include/main_0204BBB0.inc → asm/include/main_0204BBCC.inc
View File

@@ -7,7 +7,6 @@
.public LoadScriptVariableRaw
.public LoadScriptVariableValue
.public LoadScriptVariableValueAtIndex
.public LoadScriptVariableValueBytes
.public MemcpySimple
.public RandInt
.public SCRIPT_VARS_VALUES

4
asm/main_02014D18.s
View File

@@ -19157,7 +19157,7 @@ _02023E18:
add r1, sp, #2
mov r0, #0x3f
mov r2, #0xa
bl sub_0204BBB0
bl LoadScriptVariableValueString
add r0, sp, #0x42
add r1, sp, #2
mov r2, #0xa
@@ -19169,7 +19169,7 @@ _02023E44:
add r1, sp, #2
mov r0, #0x41
mov r2, #0xa
bl sub_0204BBB0
bl LoadScriptVariableValueString
add r0, sp, #0x42
add r1, sp, #2
mov r2, #0xa

13
asm/main_0204BBB0.s → asm/main_0204BBCC.s
View File

@@ -1,19 +1,8 @@
.include "asm/macros.inc"
.include "main_0204BBB0.inc"
.include "main_0204BBCC.inc"
.text
arm_func_start sub_0204BBB0
sub_0204BBB0: ; 0x0204BBB0
stmdb sp!, {r3, r4, r5, lr}
mov r5, r1
mov r4, r2
bl LoadScriptVariableValueBytes
mov r0, #0
strb r0, [r5, r4]
ldmia sp!, {r3, r4, r5, pc}
arm_func_end sub_0204BBB0
arm_func_start SaveScriptVariableValueBytes
SaveScriptVariableValueBytes: ; 0x0204BBCC
stmdb sp!, {r3, r4, r5, lr}

1
include/scripting.h
View File

@@ -38,5 +38,6 @@ void SaveScriptVariableValue(union script_var_value sv_locals[], const enum scri
void SaveScriptVariableValueAtIndex(union script_var_value sv_locals[], const enum script_var_id script_var_id, int idx, s32 new_val);
s32 LoadScriptVariableValueSum(union script_var_value sv_local[], const enum script_var_id sv_id);
void LoadScriptVariableValueBytes(const enum script_var_id sv_id, u8* result, s32 num_bytes);
void LoadScriptVariableValueString(const enum script_var_id sv_id, u8* result, u8 num_bytes);
#endif //PMDSKY_SCRIPTING_H

2
main.lsf
View File

@@ -81,7 +81,7 @@ Static main
Object src/main_0204AFF8.o
Object asm/main_0204B018.o
Object src/scripting.o
Object asm/main_0204BBB0.o
Object asm/main_0204BBCC.o
Object src/main_0204C938.o
Object asm/main_0204C94C.o
Object src/dungeon_recruitment_3.o

6
src/scripting.c
View File

@@ -317,3 +317,9 @@ void LoadScriptVariableValueBytes(const enum script_var_id sv_id, u8* result, s3
result += 1;
}
}
void LoadScriptVariableValueString(const enum script_var_id sv_id, u8* result, u8 num_bytes)
{
LoadScriptVariableValueBytes(sv_id, result, num_bytes);
result[num_bytes] = 0;
}