diff options
author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
---|---|---|
committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
commit | cb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch) | |
tree | e44bd6299c61335a9a0476db57b565aadcd0b4d7 /engine/palettes.asm | |
parent | 2ea331ebb341505df1cd8429b140c52e345a5af4 (diff) |
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'engine/palettes.asm')
-rwxr-xr-x | engine/palettes.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/palettes.asm b/engine/palettes.asm index 722b7804..94b20469 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -152,7 +152,7 @@ SetPal_Overworld: ; 71fa5 (1c:5fa5) jr z, .PokemonTowerOrAgatha cp CAVERN jr z, .caveOrBruno - ld a, [W_CURMAP] + ld a, [wCurMap] cp REDS_HOUSE_1F jr c, .townOrRoute cp UNKNOWN_DUNGEON_2 @@ -396,7 +396,7 @@ Func_7213b:: ; 7213b (1c:613b) jr z, .PokemonTowerOrAgatha cp CAVERN jr z, .caveOrBruno - ld a, [W_CURMAP] + ld a, [wCurMap] cp REDS_HOUSE_1F jr c, .townOrRoute cp UNKNOWN_DUNGEON_2 |