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/trade.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/trade.asm')
| -rwxr-xr-x | engine/trade.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/trade.asm b/engine/trade.asm index 66afa47e..4bf90f8a 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -18,14 +18,14 @@ ExternalClockTradeAnim: ; 410f3 (10:50f3) ld de, ExternalClockTradeFuncSequence TradeAnimCommon: ; 41102 (10:5102) - ld a, [W_OPTIONS] + ld a, [wOptions] push af ld a, [hSCY] push af ld a, [hSCX] push af xor a - ld [W_OPTIONS], a + ld [wOptions], a ld [hSCY], a ld [hSCX], a push de @@ -53,7 +53,7 @@ TradeAnimCommon: ; 41102 (10:5102) pop af ld [hSCY], a pop af - ld [W_OPTIONS], a + ld [wOptions], a ret addtradefunc: MACRO |