diff options
Diffstat (limited to 'engine/gfx')
| -rw-r--r-- | engine/gfx/cgb_layouts.asm | 1 | ||||
| -rw-r--r-- | engine/gfx/dma_transfer.asm | 4 | ||||
| -rw-r--r-- | engine/gfx/load_pics.asm | 17 | ||||
| -rw-r--r-- | engine/gfx/mon_icons.asm | 3 | ||||
| -rw-r--r-- | engine/gfx/pic_animation.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/sprites.asm | 7 |
6 files changed, 8 insertions, 26 deletions
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index c6527085f..d8f53d7fc 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -149,7 +149,6 @@ _CGB_FinishBattleScreenLayout: call ApplyAttrMap ret - InitPartyMenuBGPal7: farcall Function100dc0 Mobile_InitPartyMenuBGPal7: diff --git a/engine/gfx/dma_transfer.asm b/engine/gfx/dma_transfer.asm index 6519949df..241649dc5 100644 --- a/engine/gfx/dma_transfer.asm +++ b/engine/gfx/dma_transfer.asm @@ -233,7 +233,6 @@ CallInSafeGFXMode: ._hl_ jp hl - HDMATransferToWRAMBank3: call _LoadHDMAParameters ld a, $23 @@ -333,7 +332,6 @@ HDMATransfer_Wait123Scanlines: ld b, $7b jr _continue_HDMATransfer - HDMATransfer_Wait127Scanlines: ld b, $7f _continue_HDMATransfer: @@ -396,7 +394,6 @@ _continue_HDMATransfer: ret - _LoadHDMAParameters: ld a, h ld [rHDMA1], a @@ -453,7 +450,6 @@ PadMapForHDMATransfer: ld [hMapObjectIndexBuffer], a ret - _Get2bpp:: ; 2bpp when [rLCDC] & $80 ; switch to WRAM bank 6 diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm index 9be8428a9..64190083d 100644 --- a/engine/gfx/load_pics.asm +++ b/engine/gfx/load_pics.asm @@ -158,7 +158,6 @@ GetAnimatedEnemyFrontpic: ld de, wDecompressEnemyFrontpic + 7 * 7 tiles ld c, 7 * 7 .got_dims - push hl push bc call LoadFrontpicTiles @@ -418,39 +417,39 @@ PadFrontpic: jr z, .five .seven_loop - ld c, $70 + ld c, 7 << 4 call LoadOrientedFrontpic dec b jr nz, .seven_loop ret .six - ld c, $70 + ld c, 7 << 4 xor a call .Fill .six_loop - ld c, $10 + ld c, (7 - 6) << 4 xor a call .Fill - ld c, $60 + ld c, 6 << 4 call LoadOrientedFrontpic dec b jr nz, .six_loop ret .five - ld c, $70 + ld c, 7 << 4 xor a call .Fill .five_loop - ld c, $20 + ld c, (7 - 5) << 4 xor a call .Fill - ld c, $50 + ld c, 5 << 4 call LoadOrientedFrontpic dec b jr nz, .five_loop - ld c, $70 + ld c, 7 << 4 xor a call .Fill ret diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index 151f8bad5..5ae2fbf8b 100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm @@ -33,7 +33,6 @@ LoadMenuMonIcon: ld l, a jp hl - .Jumptable: dw PartyMenu_InitAnimatedMonIcon ; party menu dw NamingScreen_InitAnimatedMonIcon ; naming screen @@ -263,7 +262,6 @@ GetSpeciesIcon: call GetIconGFX ret - FlyFunction_GetMonIcon: push de ld a, [wd265] @@ -449,7 +447,6 @@ ReadMonMenuIcon: ld a, ICON_EGG ret - INCLUDE "data/pokemon/menu_icons.asm" INCLUDE "data/icon_pointers.asm" diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm index 362fe49cd..843e5cba4 100644 --- a/engine/gfx/pic_animation.asm +++ b/engine/gfx/pic_animation.asm @@ -79,7 +79,6 @@ PokeAnims: .Egg1: pokeanim Setup, Play .Egg2: pokeanim Idle, Play - AnimateFrontpic: call AnimateMon_CheckIfPokemon ret c @@ -718,7 +717,6 @@ PokeAnim_ConvertAndApplyBitmask: ; db 36, 37, 38, 39, 40, 41 ; db 43, 44, 45, 46, 47, 48 - .GetStartCoord: ld hl, wPokeAnimCoord ld a, [hli] diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index 709f8aad7..1b22e5832 100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm @@ -212,7 +212,6 @@ DeinitializeSprite: ld [hl], $0 ret - DeinitializeAllSprites: ; Clear the index field of every struct in the wSpriteAnimationStructs array. ld hl, wSpriteAnimationStructs @@ -226,7 +225,6 @@ DeinitializeAllSprites: jr nz, .loop ret - UpdateAnimFrame: call InitSpriteAnimBuffer ; init WRAM call GetSpriteAnimFrame ; read from a memory array @@ -411,7 +409,6 @@ _ReinitSpriteAnimFrame:: ld [hl], -1 ret - GetSpriteAnimFrame: .loop ld hl, SPRITEANIMSTRUCT_DURATION @@ -532,7 +529,6 @@ Unreferenced_BrokenGetStdGraphics: pop bc ret - INCLUDE "data/sprite_anims/sequences.asm" INCLUDE "engine/gfx/sprite_anims.asm" @@ -541,7 +537,6 @@ INCLUDE "data/sprite_anims/framesets.asm" INCLUDE "data/sprite_anims/oam.asm" - BrokenStdGFXPointers: ; tile count, bank, pointer ; (all pointers were dummied out to .deleted) @@ -557,7 +552,6 @@ BrokenStdGFXPointers: .deleted - Sprites_Cosine: ; a = d * cos(a * pi/32) add %010000 ; cos(x) = sin(x + pi/2) @@ -566,7 +560,6 @@ Sprites_Sine: ; a = d * sin(a * pi/32) calc_sine_wave - AnimateEndOfExpBar: ld a, [hSGB] ld de, EndOfExpBarGFX |