aboutsummaryrefslogtreecommitdiffstats
path: root/engine/events/in_game_trades.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-04 16:19:15 -0400
committerGitHub <noreply@github.com>2020-07-04 16:19:15 -0400
commit2718c36065e7eb201a149938bcdd51987c4e56b6 (patch)
tree4a1c0294193a497e15ec8e6be59390eb1f84b5d3 /engine/events/in_game_trades.asm
parentMerge pull request #256 from Rangi42/master (diff)
parentUPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET... (diff)
downloadpokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.gz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.xz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.zip
Merge pull request #257 from Rangi42/master
More reorganization
Diffstat (limited to 'engine/events/in_game_trades.asm')
-rwxr-xr-xengine/events/in_game_trades.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm
index c01bc3c3..c1466485 100755
--- a/engine/events/in_game_trades.asm
+++ b/engine/events/in_game_trades.asm
@@ -84,7 +84,7 @@ InGameTrade_GetMonName:
ld bc, NAME_LENGTH
jp CopyData
-INCLUDE "data/trades.asm"
+INCLUDE "data/events/trades.asm"
InGameTrade_DoTrade:
xor a ; NORMAL_PARTY_MENU