diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-30 12:20:16 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-30 12:20:16 +0100 |
commit | 9bad1921df42e2b199fc53c679dc0767cc271337 (patch) | |
tree | f2df987747705d66aeeda8b1074c88260ce3d522 /data/scripts/pokeblocks.inc | |
parent | 5ae6461cc5c43bbeca4cd38efcb340207f762303 (diff) | |
parent | 1496ea3a24f188cad26ac40f5bfcc3e571f3311a (diff) |
Merge branch 'master' into dump_trainer_ai_scripts
Diffstat (limited to 'data/scripts/pokeblocks.inc')
-rw-r--r-- | data/scripts/pokeblocks.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 03ee0d510..0f705c841 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -680,7 +680,7 @@ LilycoveCity_ContestLobby_EventScript_29419D:: @ 829419D LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA fadescreen 1 - specialvar VAR_RESULT, sub_8138240 + specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 special SpawnLinkPartnerFieldObject |