From f9a8f44a290c777bf4d9c4dff3fd79c75f2a2ae7 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Sun, 15 Sep 2019 15:30:35 -0400
Subject: Document script_movement

---
 src/scrcmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 0326a56a4..5ee7ddb0f 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1247,7 +1247,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
     HideFieldMessageBox();
     playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
     EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]);
-    sub_80D338C();
+    ScriptMovement_StopAll();
     UnfreezeEventObjects();
     return FALSE;
 }
@@ -1261,7 +1261,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
         EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]);
     playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
     EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]);
-    sub_80D338C();
+    ScriptMovement_StopAll();
     UnfreezeEventObjects();
     return FALSE;
 }
-- 
cgit v1.2.3


From 340c4e1411fa2aea8345d6f9af75577644ab8b9b Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Mon, 16 Sep 2019 00:22:50 -0400
Subject: Clean up script_movement documentation

---
 src/scrcmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 5ee7ddb0f..560784c47 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1247,7 +1247,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
     HideFieldMessageBox();
     playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
     EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]);
-    ScriptMovement_StopAll();
+    ScriptMovement_UnfreezeEventObjects();
     UnfreezeEventObjects();
     return FALSE;
 }
@@ -1261,7 +1261,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
         EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]);
     playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
     EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]);
-    ScriptMovement_StopAll();
+    ScriptMovement_UnfreezeEventObjects();
     UnfreezeEventObjects();
     return FALSE;
 }
-- 
cgit v1.2.3


From b596322ca2a4fa575311397158ce2ecb0053781b Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Wed, 18 Sep 2019 18:57:25 -0400
Subject: Initial script_menu documentation

---
 src/scrcmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 560784c47..4c8895ab8 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1624,7 +1624,7 @@ bool8 ScrCmd_bufferstdstring(struct ScriptContext *ctx)
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 index = VarGet(ScriptReadHalfword(ctx));
 
-    StringCopy(sScriptStringVars[stringVarIndex], gUnknown_0858BAF0[index]);
+    StringCopy(sScriptStringVars[stringVarIndex], gStdStrings[index]);
     return FALSE;
 }
 
-- 
cgit v1.2.3


From 5325835ee718b4762fc21aa81a481bb63f2dbd29 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Mon, 30 Sep 2019 15:43:44 -0400
Subject: Use STR_CONV constants

---
 src/scrcmd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 4c8895ab8..9861f9dae 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1612,10 +1612,10 @@ bool8 ScrCmd_buffermovename(struct ScriptContext *ctx)
 bool8 ScrCmd_buffernumberstring(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    u8 v2 = CountDigits(v1);
+    u16 num = VarGet(ScriptReadHalfword(ctx));
+    u8 numDigits = CountDigits(num);
 
-    ConvertIntToDecimalStringN(sScriptStringVars[stringVarIndex], v1, 0, v2);
+    ConvertIntToDecimalStringN(sScriptStringVars[stringVarIndex], num, STR_CONV_MODE_LEFT_ALIGN, numDigits);
     return FALSE;
 }
 
-- 
cgit v1.2.3


From 0df304d629b10b2c65a4cf358b80fd5cf2a7befa Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Mon, 7 Oct 2019 02:00:16 -0400
Subject: Document roulette.inc

---
 src/scrcmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 9861f9dae..d1f2ca77b 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1930,9 +1930,9 @@ bool8 ScrCmd_setberrytree(struct ScriptContext *ctx)
 
 bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
 {
-    u16 value = VarGet(ScriptReadHalfword(ctx));
+    u16 newsKind = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_Result = GetPriceReduction(value);
+    gSpecialVar_Result = GetPriceReduction(newsKind);
     return FALSE;
 }
 
-- 
cgit v1.2.3


From 1b7607bd91a9bdf9ee5e2ccbf895727bc53f9254 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Fri, 11 Oct 2019 04:14:09 -0400
Subject: Document cable_club.inc

---
 src/scrcmd.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 9861f9dae..8ddd23d6d 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -2218,6 +2218,8 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx)
     return FALSE;
 }
 
+// TODO: Should be renamed. Name implies general usage, but its specifically for Wonder Card
+// See GetSavedRamScriptIfValid, which is NULL if ValidateReceivedWonderCard returns FALSE
 bool8 ScrCmd_gotoram(struct ScriptContext *ctx)
 {
     const u8* v1 = GetSavedRamScriptIfValid();
-- 
cgit v1.2.3


From 90a05cf824b14861b7c1c942aebae31f9cb502ea Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Tue, 15 Oct 2019 05:00:08 -0400
Subject: Finish Mossdeep Gym doc, beging documenting rotating tile puzzle

---
 src/scrcmd.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 9861f9dae..c1188f16a 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -815,7 +815,7 @@ bool8 ScrCmd_warpteleport(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_warpD7(struct ScriptContext *ctx)
+bool8 ScrCmd_warpmossdeepgym(struct ScriptContext *ctx)
 {
     u8 mapGroup = ScriptReadByte(ctx);
     u8 mapNum = ScriptReadByte(ctx);
@@ -824,7 +824,7 @@ bool8 ScrCmd_warpD7(struct ScriptContext *ctx)
     u16 y = VarGet(ScriptReadHalfword(ctx));
 
     SetWarpDestination(mapGroup, mapNum, warpId, x, y);
-    sub_80AF87C();
+    DoMossdeepGymWarp();
     ResetInitialPlayerAvatarState();
     return TRUE;
 }
@@ -2151,9 +2151,9 @@ bool8 ScrCmd_takecoins(struct ScriptContext *ctx)
 
 bool8 ScrCmd_mossdeepgym1(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
+    u16 puzzleNumber = VarGet(ScriptReadHalfword(ctx));
 
-    sMovingNpcId = MossdeepGym_MoveEvents(v1);
+    sMovingNpcId = MossdeepGym_MoveEvents(puzzleNumber);
     return FALSE;
 }
 
@@ -2163,11 +2163,11 @@ bool8 ScrCmd_mossdeepgym2(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_mossdeepgym3(struct ScriptContext *ctx)
+bool8 ScrCmd_initrotatingtilepuzzle(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
+    u16 isTrickHouse = VarGet(ScriptReadHalfword(ctx));
 
-    InitMossdeepGymTiles(v1);
+    InitRotatingTilePuzzle(isTrickHouse);
     return FALSE;
 }
 
-- 
cgit v1.2.3


From 348bb002a8016d9c4bb6f6968dbc359b4d346aa9 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Fri, 11 Oct 2019 17:25:07 -0400
Subject: Document Gym scripts first half

---
 src/scrcmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index efff17722..bdeee0524 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -607,7 +607,7 @@ bool8 ScrCmd_incrementgamestat(struct ScriptContext *ctx)
 
 bool8 ScrCmd_animateflash(struct ScriptContext *ctx)
 {
-    sub_80B009C(ScriptReadByte(ctx));
+    AnimateFlash(ScriptReadByte(ctx));
     ScriptContext1_Stop();
     return TRUE;
 }
-- 
cgit v1.2.3


From 0f15264595e66f1de9aa030b69a9fedc9c75f13e Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Wed, 16 Oct 2019 04:09:30 -0400
Subject: Document rotating_tile_puzzle

---
 src/scrcmd.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index c1188f16a..35835680f 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -27,13 +27,13 @@
 #include "event_obj_lock.h"
 #include "menu.h"
 #include "money.h"
-#include "mossdeep_gym.h"
 #include "mystery_event_script.h"
 #include "palette.h"
 #include "party_menu.h"
 #include "pokemon_storage_system.h"
 #include "random.h"
 #include "overworld.h"
+#include "rotating_tile_puzzle.h"
 #include "rtc.h"
 #include "script.h"
 #include "script_menu.h"
@@ -2149,17 +2149,17 @@ bool8 ScrCmd_takecoins(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_mossdeepgym1(struct ScriptContext *ctx)
+bool8 ScrCmd_moverotatingtileobjects(struct ScriptContext *ctx)
 {
     u16 puzzleNumber = VarGet(ScriptReadHalfword(ctx));
 
-    sMovingNpcId = MossdeepGym_MoveEvents(puzzleNumber);
+    sMovingNpcId = MoveRotatingTileObjects(puzzleNumber);
     return FALSE;
 }
 
-bool8 ScrCmd_mossdeepgym2(struct ScriptContext *ctx)
+bool8 ScrCmd_turnrotatingtileobjects(struct ScriptContext *ctx)
 {
-    MossdeepGym_TurnEvents();
+    TurnRotatingTileObjects();
     return FALSE;
 }
 
@@ -2171,9 +2171,9 @@ bool8 ScrCmd_initrotatingtilepuzzle(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_mossdeepgym4(struct ScriptContext *ctx)
+bool8 ScrCmd_freerotatingtilepuzzle(struct ScriptContext *ctx)
 {
-    FinishMossdeepGymTiles();
+    FreeRotatingTilePuzzle();
     return FALSE;
 }
 
-- 
cgit v1.2.3


From 6db014cc32d28a64499af7d605be3a062560d5e0 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Thu, 17 Oct 2019 19:22:03 -0400
Subject: Document party_menu first pass

---
 src/scrcmd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index bdeee0524..0bec4d35b 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -39,7 +39,6 @@
 #include "script_menu.h"
 #include "script_movement.h"
 #include "script_pokemon_80F8.h"
-#include "script_pokemon_81B9.h"
 #include "shop.h"
 #include "slot_machine.h"
 #include "sound.h"
@@ -1938,7 +1937,7 @@ bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
 
 bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
 {
-    sub_81B9404();
+    ChooseContestMon();
     ScriptContext1_Stop();
     return TRUE;
 }
-- 
cgit v1.2.3


From 8055548fa4d6707ac311e32afc9614d4603115db Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Thu, 31 Oct 2019 17:00:37 -0400
Subject: Document legendary scripts

---
 src/scrcmd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index d97e3de47..f468ac83e 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -68,7 +68,7 @@ extern const SpecialFunc gSpecials[];
 extern const u8 *gStdScripts[];
 extern const u8 *gStdScripts_End[];
 
-void sub_809BDB4(void);
+static void CloseBrailleWindow(void);
 
 // This is defined in here so the optimizer can't see its value when compiling
 // script.c.
@@ -1528,9 +1528,9 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_cmdDA(struct ScriptContext *ctx)
+bool8 ScrCmd_closebraillemessage(struct ScriptContext *ctx)
 {
-    sub_809BDB4();
+    CloseBrailleWindow();
     return FALSE;
 }
 
@@ -2257,7 +2257,7 @@ bool8 ScrCmd_setmonmetlocation(struct ScriptContext *ctx)
     return FALSE;
 }
 
-void sub_809BDB4(void)
+static void CloseBrailleWindow(void)
 {
     ClearStdWindowAndFrame(gBrailleWindowId, 1);
     RemoveWindow(gBrailleWindowId);
-- 
cgit v1.2.3


From dd01942c4f41d65fb861a42097108e5f5d9b93e9 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Fri, 1 Nov 2019 03:41:55 -0400
Subject: Document aqua/magma hideout scripts

---
 src/scrcmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index ef18fcaf0..610547dd8 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -2280,7 +2280,7 @@ bool8 ScrCmd_buffertrainername(struct ScriptContext *ctx)
     return FALSE;
 }
 
-void sub_809BE48(u16 npcId)
+void SetMovingNpcId(u16 npcId)
 {
     sMovingNpcId = npcId;
 }
-- 
cgit v1.2.3


From 1ed3af66eb7a3f868e62d6409061a8d83a9cceae Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Sun, 10 Nov 2019 12:46:39 -0600
Subject: Document contest painting image processing effects

---
 src/scrcmd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 610547dd8..02bc026d9 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1467,10 +1467,10 @@ bool8 ScrCmd_hidemonpic(struct ScriptContext *ctx)
 
 bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
+    u8 contestWinnerId = ScriptReadByte(ctx);
+    if (contestWinnerId)
+        SetContestWinnerForPainting(contestWinnerId);
 
-    if (v1)
-        sub_812FDA8(v1);
     ShowContestWinner();
     ScriptContext1_Stop();
     return TRUE;
-- 
cgit v1.2.3


From ef8370566f14c22b9927db09b8ff69a98049c796 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Sun, 10 Nov 2019 21:54:00 -0500
Subject: Document Contest scripts

---
 src/scrcmd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 02bc026d9..a9be5c3ef 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -461,13 +461,13 @@ bool8 ScrCmd_compare_var_to_var(struct ScriptContext *ctx)
     return FALSE;
 }
 
+// Note: addvar doesn't support adding from a variable in vanilla. If you were to 
+// add a VarGet() to the above, make sure you change the `addvar VAR_*, -1`
+// in the contest scripts to `subvar VAR_*, 1`, else contests will break.
 bool8 ScrCmd_addvar(struct ScriptContext *ctx)
 {
     u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx));
     *ptr += ScriptReadHalfword(ctx);
-    // Note: addvar doesn't support adding from a variable in vanilla. If you were to 
-    // add a VarGet() to the above, make sure you change the `addvar VAR_0x8006, 65535`
-    // in the contest scripts to `subvar VAR_0x8006, 1`, else contests will break.
     return FALSE;
 }
 
@@ -1945,7 +1945,7 @@ bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
 
 bool8 ScrCmd_startcontest(struct ScriptContext *ctx)
 {
-    sub_80F840C();
+    StartContest();
     ScriptContext1_Stop();
     return TRUE;
 }
-- 
cgit v1.2.3


From 96ec5e1b84f2c1d189dc67b53a113d0299b4f37b Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Sun, 15 Dec 2019 11:42:50 -0500
Subject: Use fadescreen constants

---
 src/scrcmd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index a9be5c3ef..a6ead183b 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -650,13 +650,14 @@ bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
 
     switch (mode)
     {
-        case 1:
+        case FADE_TO_BLACK:
+        case FADE_TO_WHITE:   
         default:
             CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE);
             FadeScreen(mode, 0);
             break;
-        case 0:
-        case 2:
+        case FADE_FROM_BLACK:
+        case FADE_FROM_WHITE:
             CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_DECOMP_BUFFER_SIZE);
             FadeScreen(mode, 0);
             break;
-- 
cgit v1.2.3


From d1cf9006fb4b29e63302c69c912e431a873626c0 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Tue, 17 Dec 2019 03:24:44 -0500
Subject: Document some warp/field screen effect

---
 src/scrcmd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index a9be5c3ef..17d388bc0 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -809,7 +809,7 @@ bool8 ScrCmd_warpteleport(struct ScriptContext *ctx)
     u16 y = VarGet(ScriptReadHalfword(ctx));
 
     SetWarpDestination(mapGroup, mapNum, warpId, x, y);
-    sub_80AF848();
+    DoTeleportWarp();
     ResetInitialPlayerAvatarState();
     return TRUE;
 }
@@ -2285,7 +2285,7 @@ void SetMovingNpcId(u16 npcId)
     sMovingNpcId = npcId;
 }
 
-bool8 ScrCmd_warpE0(struct ScriptContext *ctx)
+bool8 ScrCmd_warpsootopolislegend(struct ScriptContext *ctx)
 {
     u8 mapGroup = ScriptReadByte(ctx);
     u8 mapNum = ScriptReadByte(ctx);
@@ -2294,7 +2294,7 @@ bool8 ScrCmd_warpE0(struct ScriptContext *ctx)
     u16 y = VarGet(ScriptReadHalfword(ctx));
 
     SetWarpDestination(mapGroup, mapNum, warpId, x, y);
-    sub_80AF79C();
+    DoSootopolisLegendWarp();
     ResetInitialPlayerAvatarState();
     return TRUE;
 }
-- 
cgit v1.2.3


From c19289596da7ccd86219d3f7e246a2e48a2f9ed7 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sun, 12 Jan 2020 23:24:52 -0500
Subject: Give/Take to Add/Remove for silent script macros

---
 src/scrcmd.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index ac6e2d689..0e52f5953 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -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;
-- 
cgit v1.2.3