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 /scripts/gary.asm | |
| parent | Revert "Revert "data/facing.asm, titlescreen functions, oam/sprite related fu... (diff) | |
| download | pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.tar.gz pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.tar.xz pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.zip | |
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'scripts/gary.asm')
| -rwxr-xr-x | scripts/gary.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/gary.asm b/scripts/gary.asm index 3215a04f..197ed93b 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -52,7 +52,7 @@ GaryScript2: ; 75f6a (1d:5f6a) call Delay3 xor a ld [wJoyIgnore], a - ld hl, W_OPTIONS + ld hl, wOptions res 7, [hl] ld a, $1 ld [hSpriteIndexOrTextID], a @@ -65,7 +65,7 @@ GaryScript2: ; 75f6a (1d:5f6a) ld de, GaryText_760fe call SaveEndBattleTextPointers ld a, OPP_SONY3 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ; select which team to use during the encounter ld a, [W_RIVALSTARTER] @@ -90,7 +90,7 @@ GaryScript2: ; 75f6a (1d:5f6a) ret GaryScript3: ; 75fbb (1d:5fbb) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, GaryScript_75f29 call UpdateSprites |