Sync event macros

7 files changed, 34 insertions, 32 deletions

diff --git a/src/battle_setup.c b/src/battle_setup.c
index a7da9905a..b3a42858d 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -27,6 +27,7 @@
 #include "task.h"
 #include "text.h"
 #include "trainer.h"
+#include "constants/battle_setup.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/opponents.h"
@@ -1005,34 +1006,34 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
 
     switch (sTrainerBattleMode)
     {
-    case 3:
+    case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT:
         TrainerBattleLoadArgs(gTrainerBattleSpecs_3, data);
         return gUnknown_0819F878;
-    case 4:
+    case TRAINER_BATTLE_DOUBLE:
         TrainerBattleLoadArgs(gTrainerBattleSpecs_2, data);
         SetMapVarsToTrainer();
         return gUnknown_0819F840;
-    case 1:
-    case 2:
+    case TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC:
+    case TRAINER_BATTLE_CONTINUE_SCRIPT:
         TrainerBattleLoadArgs(gTrainerBattleSpecs_1, data);
         SetMapVarsToTrainer();
         return gUnknown_0819F818;
-    case 6:
-    case 8:
+    case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE:
+    case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC:
         TrainerBattleLoadArgs(gTrainerBattleSpecs_4, data);
         SetMapVarsToTrainer();
         return gUnknown_0819F840;
-    case 7:
+    case TRAINER_BATTLE_REMATCH_DOUBLE:
         TrainerBattleLoadArgs(gTrainerBattleSpecs_2, data);
         SetMapVarsToTrainer();
         gTrainerBattleOpponent = GetRematchTrainerId(gTrainerBattleOpponent);
         return gUnknown_0819F8AE;
-    case 5:
+    case TRAINER_BATTLE_REMATCH:
         TrainerBattleLoadArgs(gTrainerBattleSpecs_0, data);
         SetMapVarsToTrainer();
         gTrainerBattleOpponent = GetRematchTrainerId(gTrainerBattleOpponent);
         return gUnknown_0819F887;
-    default:
+    default: // TRAINER_BATTLE_SINGLE
         TrainerBattleLoadArgs(gTrainerBattleSpecs_0, data);
         SetMapVarsToTrainer();
         return gUnknown_0819F818;
diff --git a/src/coins.c b/src/coins.c
index 2c217e635..273322161 100644
--- a/src/coins.c
+++ b/src/coins.c
@@ -54,7 +54,7 @@ u16 GetCoins(void)
     return gSaveBlock1.coins;
 }
 
-bool8 GiveCoins(u16 coins)
+bool8 AddCoins(u16 coins)
 {
     u32 newCoins;
 
@@ -72,7 +72,7 @@ bool8 GiveCoins(u16 coins)
     return TRUE;
 }
 
-bool8 TakeCoins(u16 coins)
+bool8 RemoveCoins(u16 coins)
 {
     if (GetCoins() >= coins)
     {
diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c
index feec11670..d9aa5d0fc 100644
--- a/src/decoration_inventory.c
+++ b/src/decoration_inventory.c
@@ -61,7 +61,7 @@ bool8 InventoryContainsDecoration(u8 decorationId)
     return FALSE;
 }
 
-bool8 GiveDecoration(u8 decorationId)
+bool8 AddDecoration(u8 decorationId)
 {
     u8 category;
     s8 slot;
@@ -159,6 +159,6 @@ void Debug_GiveAllDecorations(void)
     u8 decor;
 
     for (decor = 0; decor < DECOR_COUNT; decor++)
-        GiveDecoration(decor);
+        AddDecoration(decor);
 }
 #endif
diff --git a/src/scrcmd.c b/src/scrcmd.c
index ec3d2c1bc..fa13fa522 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -483,7 +483,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));
@@ -492,7 +492,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));
@@ -527,7 +527,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));
@@ -545,15 +545,15 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_givedecoration(struct ScriptContext *ctx)
+bool8 ScrCmd_adddecoration(struct ScriptContext *ctx)
 {
     u32 decoration = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_Result = GiveDecoration(decoration);
+    gSpecialVar_Result = AddDecoration(decoration);
     return FALSE;
 }
 
-bool8 ScrCmd_takedecoration(struct ScriptContext *ctx)
+bool8 ScrCmd_removedecoration(struct ScriptContext *ctx)
 {
     u32 decoration = VarGet(ScriptReadHalfword(ctx));
 
@@ -667,7 +667,7 @@ bool8 ScrCmd_initclock(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_dodailyevents(struct ScriptContext *ctx)
+bool8 ScrCmd_dotimebasedevents(struct ScriptContext *ctx)
 {
     DoTimeBasedEvents();
     return FALSE;
@@ -1386,7 +1386,7 @@ bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx)
     }
 }
 
-bool8 ScrCmd_drawmonpic(struct ScriptContext *ctx)
+bool8 ScrCmd_showmonpic(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
     u8 x = ScriptReadByte(ctx);
@@ -1396,7 +1396,7 @@ bool8 ScrCmd_drawmonpic(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_erasemonpic(struct ScriptContext *ctx)
+bool8 ScrCmd_hidemonpic(struct ScriptContext *ctx)
 {
     bool8 (*func)(void) = ScriptMenu_GetPicboxWaitFunc();
 
@@ -1406,7 +1406,7 @@ bool8 ScrCmd_erasemonpic(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_drawcontestwinner(struct ScriptContext *ctx)
+bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx)
 {
     u8 v1 = ScriptReadByte(ctx);
 
@@ -1598,7 +1598,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);
@@ -1608,7 +1608,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);
@@ -1997,22 +1997,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;
diff --git a/src/secret_base.c b/src/secret_base.c
index 097d95cfe..d4a44de54 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -30,6 +30,7 @@
 #include "task.h"
 #include "text.h"
 #include "constants/event_bg.h"
+#include "constants/event_objects.h"
 #include "constants/decorations.h"
 #include "constants/items.h"
 #include "constants/map_types.h"
@@ -512,7 +513,7 @@ void sub_80BBDD0(void)
                     metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
                     if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE)
                     {
-                        gSpecialVar_Result = gMapHeader.events->objectEvents[objid].graphicsId + VAR_0x3F20;
+                        gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[objid].graphicsId - OBJ_EVENT_GFX_VAR_0);
                         VarSet(gSpecialVar_Result, gDecorations[roomdecor[decidx]].tiles[0]);
                         gSpecialVar_Result = gMapHeader.events->objectEvents[objid].localId;
                         FlagClear(gSpecialVar_0x8004 + 0xAE);
diff --git a/src/shop.c b/src/shop.c
index 3e399f0da..75d83d132 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -691,7 +691,7 @@ static void Task_DoItemPurchase(u8 taskId)
         }
         else // a normal mart is only type 0, so types 1 and 2 are decoration marts.
         {
-            if (GiveDecoration(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]))
+            if (AddDecoration(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]))
             {
                 if (gMartInfo.martType == MART_TYPE_1)
                     DisplayItemMessageOnField(taskId, gOtherText_HereYouGo2, Shop_DoItemTransaction, 0xC3E1);
diff --git a/src/trader.c b/src/trader.c
index f8606d499..5403f53eb 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -249,7 +249,7 @@ void ScrSpecial_TraderDoDecorationTrade(void)
     struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     RemoveDecorationFromInventory(gSpecialVar_0x8006);
-    GiveDecoration(gSpecialVar_0x8004);
+    AddDecoration(gSpecialVar_0x8004);
     StringCopy(trader->unk5[gSpecialVar_0x8005], gSaveBlock2.playerName);
     trader->unk1[gSpecialVar_0x8005] = gSpecialVar_0x8006;
     sub_810993C();