Leahnaya/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2026-05-09 12:13:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

strbuf2 to STRING_BUFFER_1

Browse Source
This commit is contained in:
Akashi Akira 2023-05-16 21:13:47 +01:00
parent 14a518e31d
commit 632bf6870c
No known key found for this signature in database
GPG Key ID: D27E50C050AE0CE1
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/script.h
View File

@ -62,7 +62,7 @@ typedef struct ScriptEnvironment {
SCRIPTCONTEXT *scriptContexts[3];
MessageFormat *msgfmt;
STRING *stringBuffer0;
STRING *strbuf2;
STRING *stringBuffer1;
struct WaitingIconManager *unk_50;
EngagedTrainer engagedTrainers[2];
u16 specialVars[NUM_SPECIAL_VARS];
@ -95,7 +95,7 @@ typedef enum ScriptEnvField {
SCRIPTENV_SCRIPT_CONTEXT_2,
SCRIPTENV_MESSAGE_FORMAT,
SCRIPTENV_STRING_BUFFER_0,
SCRIPTENV_STRBUF2 = 18,
SCRIPTENV_STRING_BUFFER_1,
SCRIPTENV_WAITING_ICON = 19,
SCRIPTENV_AC = 20,
SCRIPTENV_GENERIC_WORK_PTR = 21,

8
src/fieldmap.c
View File

@ -104,7 +104,7 @@ BOOL Task_RunScripts(TaskManager *taskman) {
env->activeScriptContextCount = 1;
env->msgfmt = MessageFormat_new_custom(8, 64, HEAP_ID_FIELDMAP);
env->stringBuffer0 = String_ctor(1024, HEAP_ID_FIELDMAP);
env->strbuf2 = String_ctor(1024, HEAP_ID_FIELDMAP);
env->stringBuffer1 = String_ctor(1024, HEAP_ID_FIELDMAP);
env->state++;
// fallthrough
case 1:
@ -125,7 +125,7 @@ BOOL Task_RunScripts(TaskManager *taskman) {
void (*callback)(FieldSystem *a0) = env->scrctx_end_cb;
MessageFormat_delete(env->msgfmt);
String_dtor(env->stringBuffer0);
String_dtor(env->strbuf2);
String_dtor(env->stringBuffer1);
env->check = 0;
FreeToHeap(env);
if (callback != NULL) {
@ -251,8 +251,8 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv
return &environment->msgfmt;
case SCRIPTENV_STRING_BUFFER_0:
return &environment->stringBuffer0;
case SCRIPTENV_STRBUF2:
return &environment->strbuf2;
case SCRIPTENV_STRING_BUFFER_1:
return &environment->stringBuffer1;
case SCRIPTENV_WAITING_ICON:
return &environment->unk_50;
case SCRIPTENV_AC:

4
src/scrcmd_c.c
View File

@ -766,7 +766,7 @@ BOOL ScrCmd_DirectionSignpost(SCRIPTCONTEXT* ctx) {
u8 unk2;
FieldSystem* fsys = ctx->fsys;
STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF2);
STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_1);
STRING** unk1 = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_0);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
u8 msg_no = ScriptReadByte(ctx);
@ -827,7 +827,7 @@ static BOOL sub_02041520(SCRIPTCONTEXT* ctx);
BOOL ScrCmd_TrainerTips(SCRIPTCONTEXT* ctx) {
FieldSystem* fsys = ctx->fsys;
u8* printer_id_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER);
STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRBUF2);
STRING** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_1);
STRING** unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_0);
MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT);
u8 msg_no = ScriptReadByte(ctx);