diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-12 15:47:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-12 15:47:17 -0500 |
| commit | 02782093760c8a303b9126995a47af63bf3a8b95 (patch) | |
| tree | e9b98e2ce622ab500e13b784cab807e4b5b3e615 /data | |
| parent | 4e2be7ff5e4e4f6b7f664bfee4f1d4433c7f238f (diff) | |
| parent | 8df4982b3ff827ec0e7909484a67dc5923fac53d (diff) | |
Merge pull request #834 from GriffinRichards/document-trade
Document trade.c and some Union Room trading board
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 1 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_Lounge6/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/FortreeCity_House1/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PacifidlogTown_House3/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/RustboroCity_House1/scripts.inc | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 1a5e8c07b..0c0279a89 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -28,6 +28,7 @@ #include "constants/secret_bases.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/trade.h" #include "constants/trainer_hill.h" #include "constants/trainers.h" #include "constants/vars.h" diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc index 2b14c43c5..8f695aee3 100644 --- a/data/maps/BattleFrontier_Lounge6/scripts.inc +++ b/data/maps/BattleFrontier_Lounge6/scripts.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED lock faceplayer goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083 - setvar VAR_0x8008, 3 + setvar VAR_0x8008, INGAME_TRADE_MEOWTH copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 87aa7a643..e6a617677 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -5,7 +5,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB lock faceplayer goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355 - setvar VAR_0x8008, 1 + setvar VAR_0x8008, INGAME_TRADE_PLUSLE copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index 28f187da9..9633ddc8b 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -5,7 +5,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 lock faceplayer goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_203CAB - setvar VAR_0x8008, 2 + setvar VAR_0x8008, INGAME_TRADE_HORSEA copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index eb5655b1a..f0a0f4827 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -5,7 +5,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F lock faceplayer goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_2159D5 - setvar VAR_0x8008, 0 + setvar VAR_0x8008, INGAME_TRADE_SEEDOT copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT |