diff options
Diffstat (limited to 'wram.asm')
| -rwxr-xr-x | wram.asm | 115 |
1 files changed, 54 insertions, 61 deletions
@@ -230,41 +230,36 @@ wSpriteStateData1:: ; c100 ; C1xE ; C1xF spritestatedata1: MACRO -w\1SpriteStateData1:: -w\1PictureID:: db ; 0 -w\1MovementStatus:: db ; 1 -w\1SpriteImageIdx:: db ; 2 -w\1YStepVector:: db ; 3 -w\1YPixels:: db ; 4 -w\1XStepVector:: db ; 5 -w\1XPixels:: db ; 6 -w\1IntraAnimFrameCounter:: db ; 7 -w\1AnimFrameCounter:: db ; 8 -w\1FacingDirection:: db ; 9 +\1PictureID:: db +\1MovementStatus:: db +\1ImageIndex:: db +\1YStepVector:: db +\1YPixels:: db +\1XStepVector:: db +\1XPixels:: db +\1IntraAnimFrameCounter:: db +\1AnimFrameCounter:: db +\1FacingDirection:: db ds 6 -w\1SpriteStateData1End:: +\1End:: endm - spritestatedata1 Player - spritestatedata1 Sprite01 - spritestatedata1 Sprite02 - spritestatedata1 Sprite03 - spritestatedata1 Sprite04 - spritestatedata1 Sprite05 - spritestatedata1 Sprite06 - spritestatedata1 Sprite07 - spritestatedata1 Sprite08 - spritestatedata1 Sprite09 - spritestatedata1 Sprite10 - spritestatedata1 Sprite11 - spritestatedata1 Sprite12 - spritestatedata1 Sprite13 - spritestatedata1 Sprite14 - spritestatedata1 Pikachu - ; ds $10 * $10 - - -;SECTION "Sprite State Data 2", WRAM0[$c200] +wSpritePlayerStateData1:: spritestatedata1 wSpritePlayerStateData1 +wSprite01StateData1:: spritestatedata1 wSprite01StateData1 +wSprite02StateData1:: spritestatedata1 wSprite02StateData1 +wSprite03StateData1:: spritestatedata1 wSprite03StateData1 +wSprite04StateData1:: spritestatedata1 wSprite04StateData1 +wSprite05StateData1:: spritestatedata1 wSprite05StateData1 +wSprite06StateData1:: spritestatedata1 wSprite06StateData1 +wSprite07StateData1:: spritestatedata1 wSprite07StateData1 +wSprite08StateData1:: spritestatedata1 wSprite08StateData1 +wSprite09StateData1:: spritestatedata1 wSprite09StateData1 +wSprite10StateData1:: spritestatedata1 wSprite10StateData1 +wSprite11StateData1:: spritestatedata1 wSprite11StateData1 +wSprite12StateData1:: spritestatedata1 wSprite12StateData1 +wSprite13StateData1:: spritestatedata1 wSprite13StateData1 +wSprite14StateData1:: spritestatedata1 wSprite14StateData1 +wSpritePikachuStateData1:: spritestatedata1 wSpritePikachuStateData1 wSpriteStateData2:: ; c200 ; more data for all sprites on the current map @@ -287,39 +282,37 @@ wSpriteStateData2:: ; c200 ; C2xE: sprite image base offset (in video ram, player always has value 1, used to compute c1x2) ; C2xF spritestatedata2: MACRO -w\1SpriteStateData2:: -w\1WalkAnimationCounter:: db ; 0 - ds 1 -w\1YDisplacement:: db ; 2 -w\1XDisplacement:: db ; 3 -w\1MapY:: db ; 4 -w\1MapX:: db ; 5 -w\1MovementByte1:: db ; 6 -w\1GrassPriority:: db ; 7 -w\1MovementDelay:: db ; 8 +\1WalkAnimationCounter:: db + ds 1 +\1YDisplacement:: db +\1XDisplacement:: db +\1MapY:: db +\1MapX:: db +\1MovementByte1:: db +\1GrassPriority:: db +\1MovementDelay:: db ds 5 -w\1SpriteImageBaseOffset:: db ; e +\1ImageBaseOffset:: db ds 1 -w\1SpriteStateData2End:: +\1End:: endm - spritestatedata2 Player - spritestatedata2 Sprite01 - spritestatedata2 Sprite02 - spritestatedata2 Sprite03 - spritestatedata2 Sprite04 - spritestatedata2 Sprite05 - spritestatedata2 Sprite06 - spritestatedata2 Sprite07 - spritestatedata2 Sprite08 - spritestatedata2 Sprite09 - spritestatedata2 Sprite10 - spritestatedata2 Sprite11 - spritestatedata2 Sprite12 - spritestatedata2 Sprite13 - spritestatedata2 Sprite14 - spritestatedata2 Pikachu - ; ds $10 * $10 +wSpritePlayerStateData2:: spritestatedata2 wSpritePlayerStateData2 +wSprite01StateData2:: spritestatedata2 wSprite01StateData2 +wSprite02StateData2:: spritestatedata2 wSprite02StateData2 +wSprite03StateData2:: spritestatedata2 wSprite03StateData2 +wSprite04StateData2:: spritestatedata2 wSprite04StateData2 +wSprite05StateData2:: spritestatedata2 wSprite05StateData2 +wSprite06StateData2:: spritestatedata2 wSprite06StateData2 +wSprite07StateData2:: spritestatedata2 wSprite07StateData2 +wSprite08StateData2:: spritestatedata2 wSprite08StateData2 +wSprite09StateData2:: spritestatedata2 wSprite09StateData2 +wSprite10StateData2:: spritestatedata2 wSprite10StateData2 +wSprite11StateData2:: spritestatedata2 wSprite11StateData2 +wSprite12StateData2:: spritestatedata2 wSprite12StateData2 +wSprite13StateData2:: spritestatedata2 wSprite13StateData2 +wSprite14StateData2:: spritestatedata2 wSprite14StateData2 +wSpritePikachuStateData2:: spritestatedata2 wSpritePikachuStateData2 wSpriteDataEnd:: |