diff options
author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-18 12:29:05 -0500 |
---|---|---|
committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-18 12:29:05 -0500 |
commit | 54c1893d579cdf6853c6a64953bae281a6075fe3 (patch) | |
tree | 11717604336caa83ddcdb1bd8b1c765d54cf708b /scripts/pokemontower2.asm | |
parent | a002d01860a2c5a745e5837c4ff9f5d3c9e110fe (diff) | |
parent | fc9af362ae65d24c66b39ea7759637cc9c1f9b0a (diff) |
Merge pull request #104 from YamaArashi/master
fix variable naming
Diffstat (limited to 'scripts/pokemontower2.asm')
-rwxr-xr-x | scripts/pokemontower2.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 286b8202..8520b10b 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -31,7 +31,7 @@ PokemonTower2Script0: ; 6050f (18:450f) call PlayMusic ld hl, wd764 res 6, [hl] - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 ld a, $8 ld b, SPRITE_FACING_DOWN @@ -43,12 +43,12 @@ PokemonTower2Script0: ; 6050f (18:450f) .asm_60544 ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, b - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a @@ -69,7 +69,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld hl, wd764 set 7, [hl] ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld de, MovementData_605b2 ld a, [wd764] @@ -78,7 +78,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld de, MovementData_605a9 .asm_60589 ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $ff ld [wc0ee], a |