summaryrefslogtreecommitdiff
path: root/src/field/trader.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/field/trader.c')
-rw-r--r--src/field/trader.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/field/trader.c b/src/field/trader.c
index 61f48fad8..61cb0b4a2 100644
--- a/src/field/trader.c
+++ b/src/field/trader.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "constants/decorations.h"
#include "decoration.h"
#include "decoration_inventory.h"
#include "event_data.h"
@@ -7,7 +8,7 @@
#include "menu.h"
#include "menu_helpers.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "string_util.h"
#include "strings.h"
@@ -178,7 +179,7 @@ void Task_HandleGetDecorationMenuInput(u8 taskId)
void ScrSpecial_GetTraderTradedFlag(void)
{
struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
- gScriptResult = trader->alreadyTraded;
+ gSpecialVar_Result = trader->alreadyTraded;
}
void ScrSpecial_DoesPlayerHaveNoDecorations(void)
@@ -189,21 +190,21 @@ void ScrSpecial_DoesPlayerHaveNoDecorations(void)
{
if (sub_8134194(i))
{
- gScriptResult = FALSE;
+ gSpecialVar_Result = FALSE;
return;
}
}
- gScriptResult = TRUE;
+ gSpecialVar_Result = TRUE;
}
void ScrSpecial_IsDecorationFull(void)
{
- gScriptResult = FALSE;
+ gSpecialVar_Result = FALSE;
if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category
&& sub_8133F9C(gDecorations[gSpecialVar_0x8004].category) == -1)
{
sub_80FE7D4(gStringVar2, gDecorations[gSpecialVar_0x8004].category);
- gScriptResult = TRUE;
+ gSpecialVar_Result = TRUE;
}
}