diff options
Diffstat (limited to 'src/gfx.asm')
| -rw-r--r-- | src/gfx.asm | 60 |
1 files changed, 20 insertions, 40 deletions
diff --git a/src/gfx.asm b/src/gfx.asm index 32548ce..903cbad 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -41,10 +41,6 @@ INCBIN "gfx/duel/other.2bpp" DuelBoxMessages:: ; 78318 (1e:4318) INCBIN "gfx/duel/box_messages.2bpp" -rept $2b68 - db $ff -endr - SECTION "Gfx 3", ROMX WaterClubTilemap:: ; 84000 (21:4000) @@ -597,8 +593,6 @@ AnimData12:: ; 87ff4 (21:7ff4) frame_data 2, 8, 0, 0 frame_data 0, 0, 0, 0 - db $ff - SECTION "Gfx 4", ROMX OverworldMapTiles:: ; 88000 (22:4000) @@ -653,10 +647,6 @@ Palette109:: ; 8bffb (22:7ffb) db 1, %11100100 db 0 -rept $2 - db $ff -endr - SECTION "Gfx 5", ROMX LightningClubTilesetGfx:: ; 8c000 (23:4000) @@ -789,10 +779,6 @@ Duel60Gfx:: ; 93fda (24:7fda) dw $2 INCBIN "gfx/duel/anims/60.2bpp" -rept $4 - db $ff -endr - SECTION "Gfx 7", ROMX Laboratory1Gfx:: ; 94000 (25:4000) @@ -849,10 +835,6 @@ AnimData5:: ; 97fe8 (25:7fe8) frame_data 4, 16, 0, 0 frame_data 0, 0, 0, 0 -rept $9 - db $ff -endr - SECTION "Gfx 8", ROMX Titlescreen3Gfx:: ; 98000 (26:4000) @@ -1009,10 +991,6 @@ Duel64Gfx:: ; 9ffda (27:7fda) dw $2 INCBIN "gfx/duel/anims/64.2bpp" -rept $4 - db $ff -endr - SECTION "Gfx 10", ROMX DanielGfx:: ; a0000 (28:4000) @@ -1402,10 +1380,6 @@ AnimData6:: ; a7fe2 (29:7fe2) frame_data 6, 16, 0, 0 frame_data 0, 0, 0, 0 -rept $7 - db $ff -endr - SECTION "Gfx 12", ROMX Duel46Gfx:: ; a8000 (2a:4000) @@ -1483,15 +1457,9 @@ FightingGfx:: ; a8e12 (2a:4e12) SECTION "Anims 1", ROMX INCLUDE "data/anims1.asm" - db $ff - SECTION "Anims 2", ROMX INCLUDE "data/anims2.asm" -rept $2 - db $ff -endr - SECTION "Anims 3", ROMX INCLUDE "data/anims3.asm" @@ -1522,10 +1490,6 @@ SECTION "Palettes1", ROMX SECTION "Palettes2", ROMX INCLUDE "data/palettes2.asm" -rept $3b61 - db $ff -endr - SECTION "Card Gfx 1", ROMX CardGraphics:: ; c4000 (31:4000) @@ -1614,6 +1578,8 @@ NidorinaCardGfx:: ; c7ca0 (31:7ca0) INCBIN "gfx/cards/nidorina.2bpp" INCBIN "gfx/cards/nidorina.pal" + ds $58 + SECTION "Card Gfx 2", ROMX NidoqueenCardGfx:: ; c8000 (32:4000) @@ -1700,6 +1666,8 @@ KoffingCardGfx:: ; cbca0 (32:7ca0) INCBIN "gfx/cards/koffing.2bpp" INCBIN "gfx/cards/koffing.pal" + ds $58 + SECTION "Card Gfx 3", ROMX WeezingCardGfx:: ; cc000 (33:4000) @@ -1786,6 +1754,8 @@ Moltres1CardGfx:: ; cfca0 (33:7ca0) INCBIN "gfx/cards/moltres1.2bpp" INCBIN "gfx/cards/moltres1.pal" + ds $58 + SECTION "Card Gfx 4", ROMX Moltres2CardGfx:: ; d0000 (34:4000) @@ -1872,6 +1842,8 @@ SeakingCardGfx:: ; d3ca0 (34:7ca0) INCBIN "gfx/cards/seaking.2bpp" INCBIN "gfx/cards/seaking.pal" + ds $58 + SECTION "Card Gfx 5", ROMX StaryuCardGfx:: ; d4000 (35:4000) @@ -1958,6 +1930,8 @@ Magnemite1CardGfx:: ; d7ca0 (35:7ca0) INCBIN "gfx/cards/magnemite1.2bpp" INCBIN "gfx/cards/magnemite1.pal" + ds $58 + SECTION "Card Gfx 6", ROMX Magnemite2CardGfx:: ; d8000 (36:4000) @@ -2044,6 +2018,8 @@ MachokeCardGfx:: ; dbca0 (36:7ca0) INCBIN "gfx/cards/machoke.2bpp" INCBIN "gfx/cards/machoke.pal" + ds $58 + SECTION "Card Gfx 7", ROMX MachampCardGfx:: ; dc000 (37:4000) @@ -2130,6 +2106,8 @@ SlowbroCardGfx:: ; dfca0 (37:7ca0) INCBIN "gfx/cards/slowbro.2bpp" INCBIN "gfx/cards/slowbro.pal" + ds $58 + SECTION "Card Gfx 8", ROMX Gastly1CardGfx:: ; e0000 (38:4000) @@ -2216,6 +2194,8 @@ RaticateCardGfx:: ; e3ca0 (38:7ca0) INCBIN "gfx/cards/raticate.2bpp" INCBIN "gfx/cards/raticate.pal" + ds $58 + SECTION "Card Gfx 9", ROMX SpearowCardGfx:: ; e4000 (39:4000) @@ -2302,6 +2282,8 @@ PorygonCardGfx:: ; e7ca0 (39:7ca0) INCBIN "gfx/cards/porygon.2bpp" INCBIN "gfx/cards/porygon.pal" + ds $58 + SECTION "Card Gfx 10", ROMX SnorlaxCardGfx:: ; e8000 (3a:4000) @@ -2388,6 +2370,8 @@ SwitchCardGfx:: ; ebca0 (3a:7ca0) INCBIN "gfx/cards/switch.2bpp" INCBIN "gfx/cards/switch.pal" + ds $58 + SECTION "Card Gfx 11", ROMX PokemonCenterCardGfx:: ; ec000 (3b:4000) @@ -2461,7 +2445,3 @@ GamblerCardGfx:: ; ef080 (3b:7080) RecycleCardGfx:: ; ef388 (3b:7388) INCBIN "gfx/cards/recycle.2bpp" INCBIN "gfx/cards/recycle.pal" - -rept $970 - db $ff -endr |