Use more lb

and other clean up
This commit is contained in:
dannye 2015-08-05 16:20:29 -05:00
parent 891627d4ba
commit f8a9c37a00
106 changed files with 346 additions and 326 deletions

View file

@ -82,11 +82,11 @@ InitCutAnimOAM: ; eff7 (3:6ff7)
; tree
ld de, Overworld_GFX + $2d0 ; cuttable tree sprite top row
ld hl, vChars1 + $7c0
ld bc, (BANK(Overworld_GFX) << 8) + $02
lb bc, BANK(Overworld_GFX), $02
call CopyVideoData
ld de, Overworld_GFX + $3d0 ; cuttable tree sprite bottom row
ld hl, vChars1 + $7e0
ld bc, (BANK(Overworld_GFX) << 8) + $02
lb bc, BANK(Overworld_GFX), $02
call CopyVideoData
jr WriteCutOrBoulderDustAnimationOAMBlock
.grass
@ -113,7 +113,7 @@ InitCutAnimOAM: ; eff7 (3:6ff7)
LoadCutGrassAnimationTilePattern: ; f04c (3:704c)
ld de, AnimationTileset2 + $60 ; tile depicting a leaf
ld bc, (BANK(AnimationTileset2) << 8) + $01
lb bc, BANK(AnimationTileset2), $01
jp CopyVideoData
WriteCutOrBoulderDustAnimationOAMBlock: ; f055 (3:7055)

View file

@ -9,7 +9,7 @@ EmotionBubble: ; 17c47 (5:7c47)
inc hl
ld d, [hl]
ld hl, vChars1 + $780
ld bc, (BANK(EmotionBubblesPointerTable) << 8) + $04
lb bc, BANK(EmotionBubblesPointerTable), $04
call CopyVideoData
ld a, [wUpdateSpritesEnabled]
push af

View file

@ -1,7 +1,7 @@
AnimateHealingMachine: ; 70433 (1c:4433)
ld de, PokeCenterFlashingMonitorAndHealBall
ld hl, vChars0 + $7c0
ld bc, (BANK(PokeCenterFlashingMonitorAndHealBall) << 8) + $03
lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), $03
call CopyVideoData
ld hl, wUpdateSpritesEnabled
ld a, [hl]

View file

@ -69,10 +69,10 @@ LedgeTiles: ; 1a6cf (6:66cf)
LoadHoppingShadowOAM: ; 1a6f0 (6:66f0)
ld hl, vChars1 + $7f0
ld de, LedgeHoppingShadow
ld bc, (BANK(LedgeHoppingShadow) << 8) + $01
lb bc, BANK(LedgeHoppingShadow), $01
call CopyVideoDataDouble
ld a, $9
ld bc, $5448 ; b, c = y, x coordinates of shadow
lb bc, $54, $48 ; b, c = y, x coordinates of shadow
ld de, LedgeHoppingShadowOAM
call WriteOAMBlock
ret

View file

@ -47,7 +47,7 @@ EnterMapAnim: ; 70510 (1c:4510)
pop hl
ld de, BirdSprite
ld hl, vNPCSprites
ld bc, (BANK(BirdSprite) << 8) + $0c
lb bc, BANK(BirdSprite), $0c
call CopyVideoData
call LoadBirdSpriteGraphics
ld a, SFX_FLY
@ -250,11 +250,11 @@ DoFlyAnimation: ; 706ae (1c:46ae)
LoadBirdSpriteGraphics: ; 706d7 (1c:46d7)
ld de, BirdSprite
ld hl, vNPCSprites
ld bc, (BANK(BirdSprite) << 8) + $0c
lb bc, BANK(BirdSprite), $0c
call CopyVideoData
ld de, BirdSprite + $c0 ; moving animation sprite
ld hl, vNPCSprites2
ld bc, (BANK(BirdSprite) << 8) + $0c
lb bc, BANK(BirdSprite), $0c
jp CopyVideoData
InitFacingDirectionList: ; 706ef (1c:46ef)
@ -388,7 +388,7 @@ FishingAnim: ; 707b6 (1c:47b6)
set 6, [hl] ; reserve the last 4 OAM entries
ld de, RedSprite
ld hl, vNPCSprites
ld bc, (BANK(RedSprite) << 8) + $0c
lb bc, BANK(RedSprite), $0c
call CopyVideoData
ld a, $4
ld hl, RedFishingTiles

View file

@ -82,10 +82,10 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
inc a
jr z,.sellMenuLoop ; if the player closed the choose quantity menu with the B button
ld hl,PokemartTellSellPriceText
ld bc,$0e01
lb bc, 14, 1 ; location that PrintText always prints to, this is useless
call PrintText
coord hl, 14, 7
ld bc,$080f
lb bc, 08, 15
ld a,TWO_OPTION_MENU
ld [wTextBoxID],a
call DisplayTextBoxID ; yes/no menu
@ -163,7 +163,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
ld hl,PokemartTellBuyPriceText
call PrintText
coord hl, 14, 7
ld bc,$080f
lb bc, 8, 15
ld a,TWO_OPTION_MENU
ld [wTextBoxID],a
call DisplayTextBoxID ; yes/no menu

View file

@ -85,7 +85,7 @@ LoadSmokeTileFourTimes: ; 79fc0 (1e:5fc0)
LoadSmokeTile: ; 79fd4 (1e:5fd4)
ld de, SSAnneSmokePuffTile
ld bc, (BANK(SSAnneSmokePuffTile) << 8) + $01
lb bc, BANK(SSAnneSmokePuffTile), $01
jp CopyVideoData
SSAnneSmokePuffTile: ; 79fdd (1e:5fdd)