Use VRAM constants where applicable.

This commit is contained in:
yenatch 2014-05-29 01:31:46 -07:00
parent 229507e3f3
commit da0a72cdbf
34 changed files with 230 additions and 276 deletions

View file

@ -80,22 +80,22 @@ AnimateCutTree: ; eff7 (3:6ff7)
cp $52
jr z, .asm_f020
ld de, Overworld_GFX + $2d0 ; $42d0 ; cuttable tree sprite top row
ld hl, $8fc0
ld hl, vChars1 + $7c0
ld bc, (BANK(Overworld_GFX) << 8) + $02
call CopyVideoData
ld de, Overworld_GFX + $3d0 ; $43d0 ; cuttable tree sprite bottom row
ld hl, $8fe0
ld hl, vChars1 + $7e0
ld bc, (BANK(Overworld_GFX) << 8) + $02
call CopyVideoData
jr asm_f055
.asm_f020
ld hl, $8fc0
ld hl, vChars1 + $7c0
call LoadCutTreeOAM
ld hl, $8fd0
ld hl, vChars1 + $7d0
call LoadCutTreeOAM
ld hl, $8fe0
ld hl, vChars1 + $7e0
call LoadCutTreeOAM
ld hl, $8ff0
ld hl, vChars1 + $7f0
call LoadCutTreeOAM
call asm_f055
ld hl, wOAMBuffer + $93

View file

@ -8,7 +8,7 @@ PrintEmotionBubble: ; 17c47 (5:7c47)
ld e, [hl]
inc hl
ld d, [hl]
ld hl, $8f80
ld hl, vChars1 + $780
ld bc, (BANK(EmotionBubblesPointerTable) << 8) + $04
call CopyVideoData
ld a, [wcfcb]

View file

@ -1,6 +1,6 @@
AnimateHealingMachine: ; 70433 (1c:4433)
ld de, PokeCenterFlashingMonitorAndHealBall ; $44b7
ld hl, $87c0
ld hl, vChars0 + $7c0
ld bc, (BANK(PokeCenterFlashingMonitorAndHealBall) << 8) + $03
call CopyVideoData
ld hl, wcfcb

View file

@ -69,7 +69,7 @@ LedgeTiles: ; 1a6cf (6:66cf)
db $FF
LoadHoppingShadowOAM: ; 1a6f0 (6:66f0)
ld hl, $8ff0
ld hl, vChars1 + $7f0
ld de, LedgeHoppingShadow ; $6708
ld bc, (BANK(LedgeHoppingShadow) << 8) + $01
call CopyVideoDataDouble

View file

@ -126,7 +126,7 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871)
push af
push de
push bc
ld hl,$8000 ; VRAM base address
ld hl,vNPCSprites ; VRAM base address
ld bc,$c0 ; number of bytes per VRAM slot
ld a,[$ff8d]
cp a,11 ; is it a 4-tile sprite?
@ -141,12 +141,12 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871)
jr nz,.calculateVRAMAddrLoop
jr .loadStillTilePattern
.fourTileSpriteVRAMAddr
ld hl,$87c0 ; address for second 4-tile sprite
ld hl,vSprites + $7c0 ; address for second 4-tile sprite
ld a,[$ff8e] ; 4-tile sprite counter
and a ; is it the first 4-tile sprite?
jr nz,.loadStillTilePattern
; if it's the first 4-tile sprite
ld hl,$8780 ; address for first 4-tile sprite
ld hl,vSprites + $780 ; address for first 4-tile sprite
inc a
ld [$ff8e],a ; 4-tile sprite counter
.loadStillTilePattern

View file

@ -45,7 +45,7 @@ Func_70510: ; 70510 (1c:4510)
.asm_70568
pop hl
ld de, BirdSprite ; $4d80
ld hl, $8000
ld hl, vNPCSprites
ld bc, (BANK(BirdSprite) << 8) + $0c
call CopyVideoData
call Func_706d7
@ -244,11 +244,11 @@ Func_706ae: ; 706ae (1c:46ae)
Func_706d7: ; 706d7 (1c:46d7)
ld de, BirdSprite ; $4d80
ld hl, $8000
ld hl, vNPCSprites
ld bc, (BANK(BirdSprite) << 8) + $0c
call CopyVideoData
ld de, BirdSprite + $c0 ; $4e40 ; moving amination sprite
ld hl, $8800
ld hl, vNPCSprites2
ld bc, (BANK(BirdSprite) << 8) + $0c
jp CopyVideoData
@ -379,7 +379,7 @@ Func_707b6: ; 707b6 (1c:47b6)
ld hl, wd736
set 6, [hl]
ld de, RedSprite ; $4180
ld hl, $8000
ld hl, vNPCSprites
ld bc, (BANK(RedSprite) << 8) + $0c
call CopyVideoData
ld a, $4
@ -468,20 +468,20 @@ FishingRodGfxProperties: ; 70856 (1c:4856)
RedFishingTiles: ; 70866 (1c:4866)
dw RedFishingTilesFront
db $02, $1E
dw $8020
db 2, BANK(RedFishingTilesFront)
dw vNPCSprites + $20
dw RedFishingTilesBack
db $02, $1E
dw $8060
db 2, BANK(RedFishingTilesBack)
dw vNPCSprites + $60
dw RedFishingTilesSide
db $02, $1E
dw $80A0
db 2, BANK(RedFishingTilesSide)
dw vNPCSprites + $a0
dw RedFishingRodTiles
db $03, $1E
dw $8FD0
db 3, BANK(RedFishingRodTiles)
dw vNPCSprites2 + $7d0
_HandleMidJump: ; 7087e (1c:487e)
ld a, [wd714]

View file

@ -65,7 +65,7 @@ PointerTable_79fb0: ; 79fb0 (1e:5fb0)
dw Func_79337
LoadSmokeTileFourTimes: ; 79fc0 (1e:5fc0)
ld hl, $8fc0
ld hl, vChars1 + $7c0
ld c, $4
.loop
push bc