diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:59:37 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 11:59:37 -0600 |
| commit | 85a8e5f1ded5a0a2354916617dd0b82091a42ee0 (patch) | |
| tree | 9d04e3c1d115d496af910f2a1714e6e3fe82d77b /src/field/trader.c | |
| parent | 871ae4c283ec8bc7730df52790b5ca53baa82230 (diff) | |
| parent | 19895d28322609e6f67797bfec9851e0cb5a2182 (diff) | |
Merge pull request #497 from huderlem/script_commands
Port event script names from pokeemerald
Diffstat (limited to 'src/field/trader.c')
| -rw-r--r-- | src/field/trader.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field/trader.c b/src/field/trader.c index c4fe73ba1..61cb0b4a2 100644 --- a/src/field/trader.c +++ b/src/field/trader.c @@ -179,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) @@ -190,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; } } |