Port/decomp scrcmd

This commit is contained in:
Diegoisawesome
2017-10-12 02:06:19 -05:00
parent 8914645231
commit f1b6358047
115 changed files with 3540 additions and 6621 deletions

View File

@@ -40,11 +40,11 @@ void ClearTempFieldEventData(void)
{
memset(gSaveBlock1Ptr->flags, 0, TEMP_FLAGS_SIZE);
memset(gSaveBlock1Ptr->vars, 0, TEMP_VARS_SIZE);
FlagReset(SYS_ENC_UP_ITEM);
FlagReset(SYS_ENC_DOWN_ITEM);
FlagReset(SYS_USE_STRENGTH);
FlagReset(SYS_CTRL_OBJ_DELETE);
FlagReset(SYS_UNKNOWN_880);
FlagClear(SYS_ENC_UP_ITEM);
FlagClear(SYS_ENC_DOWN_ITEM);
FlagClear(SYS_USE_STRENGTH);
FlagClear(SYS_CTRL_OBJ_DELETE);
FlagClear(SYS_UNKNOWN_880);
}
// probably had different flag splits at one point.
@@ -58,7 +58,7 @@ void DisableNationalPokedex(void)
u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX);
gSaveBlock2Ptr->pokedex.nationalMagic = 0;
*nationalDexVar = 0;
FlagReset(SYS_NATIONAL_DEX);
FlagClear(SYS_NATIONAL_DEX);
}
void EnableNationalPokedex(void)
@@ -82,7 +82,7 @@ bool32 IsNationalPokedexEnabled(void)
void DisableMysteryEvent(void)
{
FlagReset(SYS_MYSTERY_EVENT_ENABLE);
FlagClear(SYS_MYSTERY_EVENT_ENABLE);
}
void EnableMysteryEvent(void)
@@ -97,7 +97,7 @@ bool32 IsMysteryEventEnabled(void)
void DisableMysteryGift(void)
{
FlagReset(SYS_MYSTERY_GIFT_ENABLE);
FlagClear(SYS_MYSTERY_GIFT_ENABLE);
}
void EnableMysteryGift(void)
@@ -112,22 +112,22 @@ bool32 IsMysteryGiftEnabled(void)
void sub_809D4D8(void)
{
FlagReset(0x1E4);
FlagReset(0x1E5);
FlagReset(0x1E6);
FlagReset(0x1E7);
FlagReset(0x1E8);
FlagReset(0x1E9);
FlagReset(0x1EA);
FlagReset(0x1EB);
FlagReset(0x1EC);
FlagReset(0x1ED);
FlagReset(0x1EE);
FlagReset(0x1EF);
FlagReset(0x1F0);
FlagReset(0x1F1);
FlagReset(0x1F2);
FlagReset(0x1F3);
FlagClear(0x1E4);
FlagClear(0x1E5);
FlagClear(0x1E6);
FlagClear(0x1E7);
FlagClear(0x1E8);
FlagClear(0x1E9);
FlagClear(0x1EA);
FlagClear(0x1EB);
FlagClear(0x1EC);
FlagClear(0x1ED);
FlagClear(0x1EE);
FlagClear(0x1EF);
FlagClear(0x1F0);
FlagClear(0x1F1);
FlagClear(0x1F2);
FlagClear(0x1F3);
}
void sub_809D570(void)
@@ -145,7 +145,7 @@ void sub_809D570(void)
void DisableResetRTC(void)
{
VarSet(VAR_RESET_RTC_ENABLE, 0);
FlagReset(SYS_RESET_RTC_ENABLE);
FlagClear(SYS_RESET_RTC_ENABLE);
}
void EnableResetRTC(void)
@@ -214,7 +214,7 @@ u8 FlagSet(u16 id)
return 0;
}
u8 FlagReset(u16 id)
u8 FlagClear(u16 id)
{
u8 *ptr = GetFlagPointer(id);
if (ptr)