atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

event data review changes

Browse source
This commit is contained in:
DizzyEggg 2018-08-12 22:04:49 +02:00
parent 577e6e7c1f
commit f1daf7442d
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/constants/flags.h
View file

@ -1570,6 +1570,7 @@
#define FLAG_0x95E (SYSTEM_FLAGS + 0xFE)
#define FLAG_0x95F (SYSTEM_FLAGS + 0xFF)
#define SPECIAL_FLAGS_START 0x4000
// SPECIAL FLAGS (unknown purpose)
#define FLAG_SPECIAL_FLAG_0x4000 0x4000
#define FLAG_SPECIAL_FLAG_0x4001 0x4001

1
include/constants/vars.h
View file

@ -273,6 +273,7 @@
#define VAR_0x40FE 0x40FE
#define VAR_0x40FF 0x40FF
#define SPECIAL_VARS_START 0x8000
// special vars
// They are commonly used as parameters to commands, or return values from commands.
#define VAR_0x8000 0x8000

10
src/event_data.c
View file

@ -25,7 +25,7 @@ EWRAM_DATA u16 gSpecialVar_MonBoxPos = 0;
EWRAM_DATA u16 gSpecialVar_0x8014 = 0;
EWRAM_DATA static u8 gUnknown_020375FC[16] = {0};
extern u16 * const gSpecialVars[];
extern u16 *const gSpecialVars[];
extern void sub_80BB358(void);
@ -166,10 +166,10 @@ u16 *GetVarPointer(u16 id)
{
if (id < VARS_START)
return NULL;
else if (id < VAR_0x8000)
else if (id < SPECIAL_VARS_START)
return &gSaveBlock1Ptr->vars[id - VARS_START];
else
return gSpecialVars[id - VAR_0x8000];
return gSpecialVars[id - SPECIAL_VARS_START];
}
u16 VarGet(u16 id)
@ -198,10 +198,10 @@ u8 *GetFlagPointer(u16 id)
{
if (id == 0)
return NULL;
else if (id < FLAG_SPECIAL_FLAG_0x4000)
else if (id < SPECIAL_FLAGS_START)
return &gSaveBlock1Ptr->flags[id / 8];
else
return &gUnknown_020375FC[(id - FLAG_SPECIAL_FLAG_0x4000) / 8];
return &gUnknown_020375FC[(id - SPECIAL_FLAGS_START) / 8];
}
u8 FlagSet(u16 id)