diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-30 22:15:32 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-30 22:15:32 -0500 |
| commit | 8026d4758565c1ae427a9995c840d8b8dbc8352b (patch) | |
| tree | 2eebf24f5761e10549f5df93993f2fac3971feb6 /engine | |
| parent | 5facf8377aeda68cb3fca389cb1784cf9c2d406b (diff) | |
No more S_
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle/scale_sprites.asm | 8 | ||||
| -rwxr-xr-x | engine/hall_of_fame.asm | 4 | ||||
| -rwxr-xr-x | engine/oak_speech.asm | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 56ea5a20..2dc34e52 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6457,7 +6457,7 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92) xor a ld [$4000], a ld hl, vSprites - ld de, S_SPRITEBUFFER1 + ld de, sSpriteBuffer1 ld a, [H_LOADEDROMBANK] ld b, a ld c, 7 * 7 diff --git a/engine/battle/scale_sprites.asm b/engine/battle/scale_sprites.asm index ed227984..6a8d43a9 100644 --- a/engine/battle/scale_sprites.asm +++ b/engine/battle/scale_sprites.asm @@ -2,12 +2,12 @@ ; assumes that input sprite chunks are 4x4 tiles, and the rightmost and bottommost 4 pixels will be ignored ; resulting in a 7*7 tile output sprite chunk ScaleSpriteByTwo: ; 2fe40 (b:7e40) - ld de, S_SPRITEBUFFER1 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped - ld hl, S_SPRITEBUFFER0 + SPRITEBUFFERSIZE - 1 ; end of destination buffer + ld de, sSpriteBuffer1 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped + ld hl, sSpriteBuffer0 + SPRITEBUFFERSIZE - 1 ; end of destination buffer call ScaleLastSpriteColumnByTwo ; last tile column is special case call ScaleFirstThreeSpriteColumnsByTwo ; scale first 3 tile columns - ld de, S_SPRITEBUFFER2 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped - ld hl, S_SPRITEBUFFER1 + SPRITEBUFFERSIZE - 1 ; end of destination buffer + ld de, sSpriteBuffer2 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped + ld hl, sSpriteBuffer1 + SPRITEBUFFERSIZE - 1 ; end of destination buffer call ScaleLastSpriteColumnByTwo ; last tile column is special case ScaleFirstThreeSpriteColumnsByTwo: ; 2fe55 (b:7e55) diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 75cbeb2c..73c4918b 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -186,8 +186,8 @@ HoFLoadPlayerPics: ; 7033e (1c:433e) ld de, RedPicFront ld a, BANK(RedPicFront) call UncompressSpriteFromDE - ld hl, S_SPRITEBUFFER1 - ld de, S_SPRITEBUFFER0 + ld hl, sSpriteBuffer1 + ld de, sSpriteBuffer0 ld bc, $310 call CopyData ld de, vFrontPic diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index d5f13a7a..c4d35639 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -215,8 +215,8 @@ IntroDisplayPicCenteredOrUpperRight: ; 62a4 (1:62a4) push bc ld a,b call UncompressSpriteFromDE - ld hl,S_SPRITEBUFFER1 - ld de,S_SPRITEBUFFER0 + ld hl,sSpriteBuffer1 + ld de,sSpriteBuffer0 ld bc,$310 call CopyData ld de,vFrontPic |