From cb414f1480e9117e5d6ee0ab5cb81903e83cde9a Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Thu, 29 Oct 2015 14:23:30 -0400 Subject: overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE Also make replace.sh take args --- scripts/agatha.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/agatha.asm') diff --git a/scripts/agatha.asm b/scripts/agatha.asm index 1e34c99c..39db37d5 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -105,7 +105,7 @@ AgathaScript3: ; 764da (1d:64da) AgathaScript2: ; 764ed (1d:64ed) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, AgathaScript_76464 ld a, $1 -- cgit v1.2.3