From dcc7bd71154c2e6a35b7d79c0813c26bb6aca95a Mon Sep 17 00:00:00 2001 From: Mateon1 Date: Thu, 19 Sep 2024 23:21:29 +0200 Subject: [PATCH] Script var buffer save/restore functions --- include/event_flag.h | 4 ++-- renames.sed | 2 ++ src/event_flag.c | 4 ++-- src/save.c | 4 ++-- sym_ewram.txt | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/event_flag.h b/include/event_flag.h index cebead9c..bab27538 100644 --- a/include/event_flag.h +++ b/include/event_flag.h @@ -78,8 +78,8 @@ u8 sub_8002658(s16 param_1); s16 sub_8002694(u8 param_1); bool8 sub_80026CC(s16 r0); void sub_80026E8(s16 r0, bool8 r1); -bool8 sub_8002700(void *r0); -bool8 sub_8002718(u8 *r0); +bool8 SaveGlobalScriptVars(void *r0); +bool8 RestoreGlobalScriptVars(u8 *r0); void sub_8002758(s32 r0); u8 sub_800276C(void); diff --git a/renames.sed b/renames.sed index 05250482..a3d05ff0 100644 --- a/renames.sed +++ b/renames.sed @@ -1,4 +1,6 @@ s/gGroundEnterLookupTable/gGroundEnterLookupTable/g s/sub_80022F8/JudgeVarWithImmediate/g s/sub_8002318/JudgeVarWithVar/g +s/sub_8002700/SaveGlobalScriptVars/g +s/sub_8002718/RestoreGlobalScriptVars/g diff --git a/src/event_flag.c b/src/event_flag.c index 56bc64fb..490bcb41 100644 --- a/src/event_flag.c +++ b/src/event_flag.c @@ -604,13 +604,13 @@ void sub_80026E8(s16 r0, bool8 r1) UnlockFriendArea(sub_8002658(r0)); } -bool8 sub_8002700(void *r0) +bool8 SaveGlobalScriptVars(void *r0) { MemoryCopy8(r0, gScriptVarBuffer, 0x400); return 1; } -bool8 sub_8002718(u8 *r0) +bool8 RestoreGlobalScriptVars(u8 *r0) { struct ScriptVarPtr temp; GetScriptVarRef(&temp, 0, 0); diff --git a/src/save.c b/src/save.c index a2d74590..5099d464 100644 --- a/src/save.c +++ b/src/save.c @@ -218,7 +218,7 @@ u32 ReadSaveFromPak(u32 *a) if (!saveStatus) { if (gUnknown_203B184 == NULL) { - if (!sub_8002718(playerSave->unk004)) { + if (!RestoreGlobalScriptVars(playerSave->unk004)) { saveStatus = 4; } } @@ -343,7 +343,7 @@ u32 WriteSavetoPak(s32 *param_1, u32 param_2) gameName = GetGameInternalName(); strncpy(playerSave->gameInternalName,gameName, ARRAY_COUNT(playerSave->gameInternalName)); if (gUnknown_203B184 == NULL) { - sub_8002700(playerSave->unk004); + SaveGlobalScriptVars(playerSave->unk004); } else { MemoryCopy8(playerSave->unk004,gUnknown_203B184->unk04C,ARRAY_COUNT(playerSave->unk004)); diff --git a/sym_ewram.txt b/sym_ewram.txt index 4782ed25..b80e3263 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -4,7 +4,7 @@ gUnknown_2000A80: /* 2000A80 (GameLoop) */ .space 0x8 -gScriptVarBuffer: /* 2000A88 (ThoroughlyResetScriptVars - sub_8002718) */ +gScriptVarBuffer: /* 2000A88 (ThoroughlyResetScriptVars - RestoreGlobalScriptVars) */ .space 0x400 .include "src/memory.o"