Renamed setmodernfatefulencounter and checkmodernfatefulencounter for consistency reasons
This commit is contained in:
@@ -205,8 +205,8 @@ gScriptCmdTable::
|
|||||||
.4byte ScrCmd_nop1 @ 0xca
|
.4byte ScrCmd_nop1 @ 0xca
|
||||||
.4byte ScrCmd_nop1 @ 0xcb
|
.4byte ScrCmd_nop1 @ 0xcb
|
||||||
.4byte ScrCmd_nop1 @ 0xcc
|
.4byte ScrCmd_nop1 @ 0xcc
|
||||||
.4byte ScrCmd_setmonmodernfatefulencounter @ 0xcd
|
.4byte ScrCmd_setmodernfatefulencounter @ 0xcd
|
||||||
.4byte ScrCmd_checkmonmodernfatefulencounter @ 0xce
|
.4byte ScrCmd_checkmodernfatefulencounter @ 0xce
|
||||||
.4byte ScrCmd_trywondercardscript @ 0xcf
|
.4byte ScrCmd_trywondercardscript @ 0xcf
|
||||||
.4byte ScrCmd_nop1 @ 0xd0
|
.4byte ScrCmd_nop1 @ 0xd0
|
||||||
.4byte ScrCmd_warpspinenter @ 0xd1
|
.4byte ScrCmd_warpspinenter @ 0xd1
|
||||||
|
|||||||
+2
-2
@@ -2207,7 +2207,7 @@ bool8 ScrCmd_lockfortrainer(struct ScriptContext *ctx)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// This command will set a Pokémon's modernFatefulEncounter bit; there is no similar command to clear it.
|
// This command will set a Pokémon's modernFatefulEncounter bit; there is no similar command to clear it.
|
||||||
bool8 ScrCmd_setmonmodernfatefulencounter(struct ScriptContext *ctx)
|
bool8 ScrCmd_setmodernfatefulencounter(struct ScriptContext *ctx)
|
||||||
{
|
{
|
||||||
bool8 isModernFatefulEncounter = TRUE;
|
bool8 isModernFatefulEncounter = TRUE;
|
||||||
u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
|
u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
|
||||||
@@ -2216,7 +2216,7 @@ bool8 ScrCmd_setmonmodernfatefulencounter(struct ScriptContext *ctx)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool8 ScrCmd_checkmonmodernfatefulencounter(struct ScriptContext *ctx)
|
bool8 ScrCmd_checkmodernfatefulencounter(struct ScriptContext *ctx)
|
||||||
{
|
{
|
||||||
u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
|
u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user