dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Give/Take to Add/Remove for silent script macros

Browse Source
This commit is contained in:
GriffinR
2020-01-12 23:24:52 -05:00
parent e497fc64e3
commit c19289596d
22 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/coins.c
View File

@@ -48,7 +48,7 @@ void SetCoins(u16 coinAmount)
gSaveBlock1Ptr->coins = coinAmount ^ gSaveBlock2Ptr->encryptionKey;
}
bool8 GiveCoins(u16 toAdd)
bool8 AddCoins(u16 toAdd)
{
u16 newAmount;
u16 ownedCoins = GetCoins();
@@ -70,7 +70,7 @@ bool8 GiveCoins(u16 toAdd)
return TRUE;
}
bool8 TakeCoins(u16 toSub)
bool8 RemoveCoins(u16 toSub)
{
u16 ownedCoins = GetCoins();
if (ownedCoins >= toSub)

22
src/scrcmd.c
View File

@@ -486,7 +486,7 @@ bool8 ScrCmd_random(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_giveitem(struct ScriptContext *ctx)
bool8 ScrCmd_additem(struct ScriptContext *ctx)
{
u16 itemId = VarGet(ScriptReadHalfword(ctx));
u32 quantity = VarGet(ScriptReadHalfword(ctx));
@@ -495,7 +495,7 @@ bool8 ScrCmd_giveitem(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_takeitem(struct ScriptContext *ctx)
bool8 ScrCmd_removeitem(struct ScriptContext *ctx)
{
u16 itemId = VarGet(ScriptReadHalfword(ctx));
u32 quantity = VarGet(ScriptReadHalfword(ctx));
@@ -530,7 +530,7 @@ bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_givepcitem(struct ScriptContext *ctx)
bool8 ScrCmd_addpcitem(struct ScriptContext *ctx)
{
u16 itemId = VarGet(ScriptReadHalfword(ctx));
u16 quantity = VarGet(ScriptReadHalfword(ctx));
@@ -548,7 +548,7 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_givedecoration(struct ScriptContext *ctx)
bool8 ScrCmd_adddecoration(struct ScriptContext *ctx)
{
u32 decorId = VarGet(ScriptReadHalfword(ctx));
@@ -556,7 +556,7 @@ bool8 ScrCmd_givedecoration(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_takedecoration(struct ScriptContext *ctx)
bool8 ScrCmd_removedecoration(struct ScriptContext *ctx)
{
u32 decorId = VarGet(ScriptReadHalfword(ctx));
@@ -1726,7 +1726,7 @@ bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_givemoney(struct ScriptContext *ctx)
bool8 ScrCmd_addmoney(struct ScriptContext *ctx)
{
u32 amount = ScriptReadWord(ctx);
u8 ignore = ScriptReadByte(ctx);
@@ -1736,7 +1736,7 @@ bool8 ScrCmd_givemoney(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_takemoney(struct ScriptContext *ctx)
bool8 ScrCmd_removemoney(struct ScriptContext *ctx)
{
u32 amount = ScriptReadWord(ctx);
u8 ignore = ScriptReadByte(ctx);
@@ -2127,22 +2127,22 @@ bool8 ScrCmd_checkcoins(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_givecoins(struct ScriptContext *ctx)
bool8 ScrCmd_addcoins(struct ScriptContext *ctx)
{
u16 coins = VarGet(ScriptReadHalfword(ctx));
if (GiveCoins(coins) == TRUE)
if (AddCoins(coins) == TRUE)
gSpecialVar_Result = 0;
else
gSpecialVar_Result = 1;
return FALSE;
}
bool8 ScrCmd_takecoins(struct ScriptContext *ctx)
bool8 ScrCmd_removecoins(struct ScriptContext *ctx)
{
u16 coins = VarGet(ScriptReadHalfword(ctx));
if (TakeCoins(coins) == TRUE)
if (RemoveCoins(coins) == TRUE)
gSpecialVar_Result = 0;
else
gSpecialVar_Result = 1;