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/fightingdojo.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/fightingdojo.asm') diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index fa05d486..101701b1 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -32,10 +32,10 @@ FightingDojoScript1: ; 5cd83 (17:4d83) xor a ld [hJoyHeld], a ld [wcf0d], a - ld a, [W_YCOORD] + ld a, [wYCoord] cp $3 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $4 ret nz ld a, $1 @@ -53,7 +53,7 @@ FightingDojoScript1: ; 5cd83 (17:4d83) ret FightingDojoScript3: ; 5cdc6 (17:4dc6) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, FightingDojoScript_5cd70 ld a, [wcf0d] -- cgit v1.2.3