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/ssanne2.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 'scripts/ssanne2.asm')
| -rwxr-xr-x | scripts/ssanne2.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 8bcc2b17..52b9792c 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -71,7 +71,7 @@ CoordsData_61411: ; 61411 (18:5411) db $FF SSAnne2Script_61416: ; 61416 (18:5416) - ld a, [W_XCOORD] + ld a, [wXCoord] cp $25 jr nz, .asm_61426 ld a, PLAYER_DIR_LEFT @@ -98,7 +98,7 @@ SSAnne2Script1: ; 61430 (18:5430) call DisplayTextID call Delay3 ld a, OPP_SONY2 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ; select which team to use during the encounter ld a, [W_RIVALSTARTER] @@ -122,7 +122,7 @@ SSAnne2Script1: ; 61430 (18:5430) ret SSAnne2Script2: ; 6146d (18:546d) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SSAnne2Script_613ab call SSAnne2Script_61416 @@ -134,7 +134,7 @@ SSAnne2Script2: ; 6146d (18:546d) ld a, $2 ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld a, [W_XCOORD] + ld a, [wXCoord] cp $25 jr nz, .asm_61497 ld de, MovementData_614b9 |