Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ldtile and dwtile macros added and globally implemented

Browse Source
This commit is contained in:
PikalaxALT
2015-10-13 11:37:10 -04:00
parent 0c39f6e273
commit 8c2766e1b9
6 changed files with 99 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
tilesets/animations.asm
View File

@@ -41,7 +41,7 @@ Tileset00Anim: ; 0xfc01b
Tileset02Anim: ; 0xfc01b
Tileset03Anim: ; 0xfc01b
; param, function
dw $9140, AnimateWaterTile
dwtile $14, VTiles2, AnimateWaterTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -56,9 +56,9 @@ Tileset03Anim: ; 0xfc01b
Tileset25Anim: ; 0xfc047
; param, function
dw $9140, AnimateWaterTile
dwtile $14, VTiles2, AnimateWaterTile
dw NULL, WaitTileAnimation
dw $95f0, AnimateFountain
dwtile $5f, VTiles2, AnimateFountain
dw NULL, WaitTileAnimation
dw NULL, TileAnimationPalette
dw NULL, WaitTileAnimation
@@ -79,7 +79,7 @@ Tileset31Anim: ; 0xfc073
dw NULL, ForestTreeLeftAnimation2
dw NULL, ForestTreeRightAnimation2
dw NULL, AnimateFlowerTile
dw $9140, AnimateWaterTile
dwtile $14, VTiles2, AnimateWaterTile
dw NULL, TileAnimationPalette
dw NULL, NextTileFrame8
dw NULL, DoneTileAnimation
@@ -87,7 +87,7 @@ Tileset31Anim: ; 0xfc073
Tileset01Anim: ; 0xfc0a3
; param, function
dw $9140, AnimateWaterTile
dwtile $14, VTiles2, AnimateWaterTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, TileAnimationPalette
@@ -104,9 +104,9 @@ Tileset01Anim: ; 0xfc0a3
TilesetAnimfc0d7: ; 0xfc0d7
; param, function
dw $9030, WriteTileToBuffer
dwtile $03, VTiles2, WriteTileToBuffer
dw wcf41, ScrollTileRightLeft
dw $9030, WriteTileFromBuffer
dwtile $03, VTiles2, WriteTileFromBuffer
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -119,9 +119,9 @@ TilesetAnimfc0d7: ; 0xfc0d7
TilesetAnimfc103: ; 0xfc103
; param, function
dw $9140, WriteTileToBuffer
dwtile $14, VTiles2, WriteTileToBuffer
dw wcf41, ScrollTileRightLeft
dw $9140, WriteTileFromBuffer
dwtile $14, VTiles2, WriteTileFromBuffer
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -134,7 +134,7 @@ TilesetAnimfc103: ; 0xfc103
Tileset09Anim: ; 0xfc12f
; param, function
dw $9140, AnimateWaterTile
dwtile $14, VTiles2, AnimateWaterTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -162,50 +162,50 @@ Tileset15Anim: ; 0xfc15f
TilesetAnimfc17f: ; 0xfc17f
; param, function
dw $9530, WriteTileToBuffer
dwtile $53, VTiles2, WriteTileToBuffer
dw wcf41, ScrollTileDown
dw wcf41, ScrollTileDown
dw $9530, WriteTileFromBuffer
dw $9030, WriteTileToBuffer
dwtile $53, VTiles2, WriteTileFromBuffer
dwtile $03, VTiles2, WriteTileToBuffer
dw wcf41, ScrollTileRightLeft
dw $9030, WriteTileFromBuffer
dw $9530, WriteTileToBuffer
dwtile $03, VTiles2, WriteTileFromBuffer
dwtile $53, VTiles2, WriteTileToBuffer
dw wcf41, ScrollTileDown
dw wcf41, ScrollTileDown
dw $9530, WriteTileFromBuffer
dwtile $53, VTiles2, WriteTileFromBuffer
dw NULL, DoneTileAnimation
; 0xfc1af
TilesetAnimfc1af: ; 0xfc1af
; param, function
dw $9540, WriteTileToBuffer
dwtile $54, VTiles2, WriteTileToBuffer
dw wcf41, ScrollTileDown
dw wcf41, ScrollTileDown
dw $9540, WriteTileFromBuffer
dwtile $54, VTiles2, WriteTileFromBuffer
dw NULL, WaitTileAnimation
dw $9030, WriteTileToBuffer
dwtile $03, VTiles2, WriteTileToBuffer
dw wcf41, ScrollTileRightLeft
dw $9030, WriteTileFromBuffer
dwtile $03, VTiles2, WriteTileFromBuffer
dw NULL, WaitTileAnimation
dw $9540, WriteTileToBuffer
dwtile $54, VTiles2, WriteTileToBuffer
dw wcf41, ScrollTileDown
dw wcf41, ScrollTileDown
dw $9540, WriteTileFromBuffer
dwtile $54, VTiles2, WriteTileFromBuffer
dw NULL, DoneTileAnimation
; 0xfc1e7
Tileset24Anim: ; 0xfc1e7
Tileset30Anim: ; 0xfc1e7
; param, function
dw $9140, WriteTileToBuffer
dwtile $14, VTiles2, WriteTileToBuffer
dw NULL, Functionfc71e
dw wcf41, ScrollTileRightLeft
dw NULL, Functionfc71e
dw $9140, WriteTileFromBuffer
dwtile $14, VTiles2, WriteTileFromBuffer
dw NULL, Functionfc71e
dw NULL, TileAnimationPalette
dw NULL, Functionfc71e
dw $9400, WriteTileToBuffer
dwtile $40, VTiles2, WriteTileToBuffer
dw NULL, Functionfc71e
dw wcf41, ScrollTileDown
dw NULL, Functionfc71e
@@ -213,22 +213,22 @@ Tileset30Anim: ; 0xfc1e7
dw NULL, Functionfc71e
dw wcf41, ScrollTileDown
dw NULL, Functionfc71e
dw $9400, WriteTileFromBuffer
dwtile $40, VTiles2, WriteTileFromBuffer
dw NULL, Functionfc71e
dw NULL, DoneTileAnimation
; 0xfc233
Tileset29Anim: ; 0xfc233
; param, function
dw $9350, WriteTileToBuffer
dwtile $35, VTiles2, WriteTileToBuffer
dw NULL, Functionfc71e
dw wcf41, ScrollTileRightLeft
dw NULL, Functionfc71e
dw $9350, WriteTileFromBuffer
dwtile $35, VTiles2, WriteTileFromBuffer
dw NULL, Functionfc71e
dw NULL, TileAnimationPalette
dw NULL, Functionfc71e
dw $9310, WriteTileToBuffer
dwtile $31, VTiles2, WriteTileToBuffer
dw NULL, Functionfc71e
dw wcf41, ScrollTileDown
dw NULL, Functionfc71e
@@ -236,7 +236,7 @@ Tileset29Anim: ; 0xfc233
dw NULL, Functionfc71e
dw wcf41, ScrollTileDown
dw NULL, Functionfc71e
dw $9310, WriteTileFromBuffer
dwtile $31, VTiles2, WriteTileFromBuffer
dw NULL, Functionfc71e
dw NULL, DoneTileAnimation
; 0xfc27f
@@ -262,9 +262,9 @@ Tileset23Anim: ; 0xfc27f
; 0xfc2bf
TilesetAnimfc2bf: ; 0xfc2bf
dw $94f0, WriteTileToBuffer
dwtile $4f, VTiles2, WriteTileToBuffer
dw wcf41, ScrollTileRightLeft
dw $94f0, WriteTileFromBuffer
dwtile $4f, VTiles2, WriteTileFromBuffer
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -1043,16 +1043,16 @@ Functionfc71e: ; fc71e
; fc750
SproutPillarTilePointer1: dw $92d0, SproutPillarTile1
SproutPillarTilePointer2: dw $92f0, SproutPillarTile2
SproutPillarTilePointer3: dw $93d0, SproutPillarTile3
SproutPillarTilePointer4: dw $93f0, SproutPillarTile4
SproutPillarTilePointer5: dw $93c0, SproutPillarTile5
SproutPillarTilePointer6: dw $92c0, SproutPillarTile6
SproutPillarTilePointer7: dw $94d0, SproutPillarTile7
SproutPillarTilePointer8: dw $94f0, SproutPillarTile8
SproutPillarTilePointer9: dw $95d0, SproutPillarTile9
SproutPillarTilePointer10: dw $95f0, SproutPillarTile10
SproutPillarTilePointer1: dwtile $2d, VTiles2, SproutPillarTile1
SproutPillarTilePointer2: dwtile $2f, VTiles2, SproutPillarTile2
SproutPillarTilePointer3: dwtile $3d, VTiles2, SproutPillarTile3
SproutPillarTilePointer4: dwtile $3f, VTiles2, SproutPillarTile4
SproutPillarTilePointer5: dwtile $3c, VTiles2, SproutPillarTile5
SproutPillarTilePointer6: dwtile $2c, VTiles2, SproutPillarTile6
SproutPillarTilePointer7: dwtile $4d, VTiles2, SproutPillarTile7
SproutPillarTilePointer8: dwtile $4f, VTiles2, SproutPillarTile8
SproutPillarTilePointer9: dwtile $5d, VTiles2, SproutPillarTile9
SproutPillarTilePointer10: dwtile $5f, VTiles2, SproutPillarTile10
SproutPillarTile1: INCBIN "gfx/tilesets/sprout-pillar/1.2bpp"
SproutPillarTile2: INCBIN "gfx/tilesets/sprout-pillar/2.2bpp"
@@ -1067,10 +1067,10 @@ SproutPillarTile10: INCBIN "gfx/tilesets/sprout-pillar/10.2bpp"
; fca98
WhirlpoolFrames1: dw $9320, WhirlpoolTiles1
WhirlpoolFrames2: dw $9330, WhirlpoolTiles2
WhirlpoolFrames3: dw $9420, WhirlpoolTiles3
WhirlpoolFrames4: dw $9430, WhirlpoolTiles4
WhirlpoolFrames1: dwtile $32, VTiles2, WhirlpoolTiles1
WhirlpoolFrames2: dwtile $33, VTiles2, WhirlpoolTiles2
WhirlpoolFrames3: dwtile $42, VTiles2, WhirlpoolTiles3
WhirlpoolFrames4: dwtile $43, VTiles2, WhirlpoolTiles4
; fcaa8
WhirlpoolTiles1: INCBIN "gfx/tilesets/whirlpool/1.2bpp"