event flag clean-up

This commit is contained in:
DizzyEggg
2025-06-16 21:10:47 +02:00
parent 528abe1211
commit 9582598c68
6 changed files with 247 additions and 239 deletions

View File

@@ -39,10 +39,11 @@ u8 MapIdToFriendAreaId(s16 mapId_); // map -> friend area lookup
s16 FriendAreaIdToMapId(u8 friendAreaId); // friend area -> map lookup
bool8 sub_80026CC(s16 r0);
void sub_80026E8(s16 r0, bool8 r1);
bool8 SaveGlobalScriptVars(void *r0);
bool8 RestoreGlobalScriptVars(u8 *r0);
bool8 SaveGlobalScriptVars(void *dest);
bool8 RestoreGlobalScriptVars(u8 *src);
// EWRAM
extern u8 gScriptVarBuffer[0x400];
#define SCRIPT_VAR_BUFFER_LEN 0x400
extern u8 gScriptVarBuffer[SCRIPT_VAR_BUFFER_LEN];
#endif // GUARD_EVENT_FLAG_H

View File

@@ -3,6 +3,18 @@
#include "constants/event_flag.h"
enum {
SCRIPT_VAR_TYPE_0, // 0
SCRIPT_VAR_TYPE_BIT, // 1
SCRIPT_VAR_TYPE_U8, // 2
SCRIPT_VAR_TYPE_S8, // 3
SCRIPT_VAR_TYPE_U16, // 4
SCRIPT_VAR_TYPE_S16, // 5
SCRIPT_VAR_TYPE_S32, // 6
SCRIPT_VAR_TYPE_U8_2, // 7 Unused
SCRIPT_VAR_TYPE_SPECIAL, // 8
};
// size: 0x10
struct ScriptVarInfo {
s16 type;
@@ -11,7 +23,7 @@ struct ScriptVarInfo {
s16 bitOffset;
s16 arrayLen;
s16 defaultValue;
char *name;
const char *name;
};
extern const struct ScriptVarInfo gScriptVarInfo[SCRIPT_VARS_COUNT];