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 --- engine/battle/init_battle_variables.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/battle/init_battle_variables.asm') diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 78f4ad22..5383a546 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -27,7 +27,7 @@ InitBattleVariables: ; f6236 (3d:6236) jr nz, .loop inc a ; POUND ld [wTestBattlePlayerSelectedMove], a - ld a, [W_CURMAP] + ld a, [wCurMap] cp SAFARI_ZONE_EAST jr c, .notSafariBattle cp SAFARI_ZONE_REST_HOUSE_1 -- cgit v1.3.1-sl0p