ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move

Browse Source
This commit is contained in:
Diegoisawesome 2018-08-12 13:17:51 -07:00
commit bd2b7beb07
3 changed files with 38 additions and 38 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_0x95E (SYSTEM_FLAGS + 0xFE)
#define FLAG_0x95F (SYSTEM_FLAGS + 0xFF) #define FLAG_0x95F (SYSTEM_FLAGS + 0xFF)
#define SPECIAL_FLAGS_START 0x4000
// SPECIAL FLAGS (unknown purpose) // SPECIAL FLAGS (unknown purpose)
#define FLAG_SPECIAL_FLAG_0x4000 0x4000 #define FLAG_SPECIAL_FLAG_0x4000 0x4000
#define FLAG_SPECIAL_FLAG_0x4001 0x4001 #define FLAG_SPECIAL_FLAG_0x4001 0x4001

1
include/constants/vars.h
View File

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

74
src/event_data.c
View File

@ -25,7 +25,7 @@ EWRAM_DATA u16 gSpecialVar_MonBoxPos = 0;
EWRAM_DATA u16 gSpecialVar_0x8014 = 0; EWRAM_DATA u16 gSpecialVar_0x8014 = 0;
EWRAM_DATA static u8 gUnknown_020375FC[16] = {0}; EWRAM_DATA static u8 gUnknown_020375FC[16] = {0};
extern u16 * const gSpecialVars[]; extern u16 *const gSpecialVars[];
extern void sub_80BB358(void); extern void sub_80BB358(void);
@ -47,7 +47,7 @@ void ClearTempFieldEventData(void)
FlagClear(FLAG_0x880); FlagClear(FLAG_0x880);
} }
// probably had different flag splits at one point. // Probably had different flag splits at one point.
void ClearUpperFlags(void) void ClearUpperFlags(void)
{ {
memset(gSaveBlock1Ptr->flags + 0x124, 0, TEMP_UPPER_FLAGS_SIZE); memset(gSaveBlock1Ptr->flags + 0x124, 0, TEMP_UPPER_FLAGS_SIZE);
@ -112,34 +112,34 @@ bool32 IsMysteryGiftEnabled(void)
void sub_809D4D8(void) void sub_809D4D8(void)
{ {
FlagClear(0x1E4); FlagClear(FLAG_MYSTERY_EVENT_DONE);
FlagClear(0x1E5); FlagClear(FLAG_0x1E5);
FlagClear(0x1E6); FlagClear(FLAG_0x1E6);
FlagClear(0x1E7); FlagClear(FLAG_0x1E7);
FlagClear(0x1E8); FlagClear(FLAG_0x1E8);
FlagClear(0x1E9); FlagClear(FLAG_0x1E9);
FlagClear(0x1EA); FlagClear(FLAG_0x1EA);
FlagClear(0x1EB); FlagClear(FLAG_0x1EB);
FlagClear(0x1EC); FlagClear(FLAG_0x1EC);
FlagClear(0x1ED); FlagClear(FLAG_0x1ED);
FlagClear(0x1EE); FlagClear(FLAG_0x1EE);
FlagClear(0x1EF); FlagClear(FLAG_0x1EF);
FlagClear(0x1F0); FlagClear(FLAG_0x1F0);
FlagClear(0x1F1); FlagClear(FLAG_0x1F1);
FlagClear(0x1F2); FlagClear(FLAG_0x1F2);
FlagClear(0x1F3); FlagClear(FLAG_0x1F3);
} }
void sub_809D570(void) void sub_809D570(void)
{ {
VarSet(0x40DD, 0); VarSet(VAR_EVENT_PICHU_SLOT, 0);
VarSet(0x40DE, 0); VarSet(VAR_0x40DE, 0);
VarSet(0x40DF, 0); VarSet(VAR_0x40DF, 0);
VarSet(0x40E0, 0); VarSet(VAR_0x40E0, 0);
VarSet(0x40E1, 0); VarSet(VAR_0x40E1, 0);
VarSet(0x40E2, 0); VarSet(VAR_0x40E2, 0);
VarSet(0x40E3, 0); VarSet(VAR_0x40E3, 0);
VarSet(0x40E4, 0); VarSet(VAR_0x40E4, 0);
} }
void DisableResetRTC(void) void DisableResetRTC(void)
@ -164,13 +164,12 @@ bool32 CanResetRTC(void)
u16 *GetVarPointer(u16 id) u16 *GetVarPointer(u16 id)
{ {
if (id < 0x4000) if (id < VARS_START)
return NULL; return NULL;
else if (id < SPECIAL_VARS_START)
if ((s16)id >= 0) return &gSaveBlock1Ptr->vars[id - VARS_START];
return &gSaveBlock1Ptr->vars[id - 0x4000]; else
return gSpecialVars[id - SPECIAL_VARS_START];
return gSpecialVars[id - 0x8000];
} }
u16 VarGet(u16 id) u16 VarGet(u16 id)
@ -192,18 +191,17 @@ bool8 VarSet(u16 id, u16 value)
u8 VarGetEventObjectGraphicsId(u8 id) u8 VarGetEventObjectGraphicsId(u8 id)
{ {
return VarGet(0x4010 + id); return VarGet(VAR_OBJ_GFX_ID_0 + id);
} }
u8 *GetFlagPointer(u16 id) u8 *GetFlagPointer(u16 id)
{ {
if (id == 0) if (id == 0)
return 0; return NULL;
else if (id < SPECIAL_FLAGS_START)
if (id < 0x4000)
return &gSaveBlock1Ptr->flags[id / 8]; return &gSaveBlock1Ptr->flags[id / 8];
else
return &gUnknown_020375FC[(id - 0x4000) / 8]; return &gUnknown_020375FC[(id - SPECIAL_FLAGS_START) / 8];
} }
u8 FlagSet(u16 id) u8 FlagSet(u16 id)