thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix spritestatedata macros to be prefixed with w.

Browse source
This commit is contained in:
luckytyphlosion 2018-11-18 17:54:46 -05:00
parent f386dea5d8
commit c085aa4a2a
2 changed files with 38 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/pewterpokecenter.asm
View file

@ -29,7 +29,7 @@ PewterJigglypuffText:
ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections
call CopyData call CopyData
ld a, [Sprite03SpriteImageIdx] ld a, [wSprite03StateData1ImageIndex]
ld hl, wJigglypuffFacingDirections ld hl, wJigglypuffFacingDirections
.findMatchingFacingDirectionLoop .findMatchingFacingDirectionLoop
cp [hl] cp [hl]
@ -43,7 +43,7 @@ PewterJigglypuffText:
pop hl pop hl
.loop .loop
ld a, [hl] ld a, [hl]
ld [Sprite03SpriteImageIdx], a ld [wSprite03StateData1ImageIndex], a
; rotate the array ; rotate the array
push hl push hl

78
wram.asm
View file

@ -230,10 +230,9 @@ wSpriteStateData1:: ; c100
; C1xE ; C1xE
; C1xF ; C1xF
spritestatedata1: MACRO spritestatedata1: MACRO
\1SpriteStateData1::
\1PictureID:: db \1PictureID:: db
\1MovementStatus:: db \1MovementStatus:: db
\1SpriteImageIdx:: db \1ImageIndex:: db
\1YStepVector:: db \1YStepVector:: db
\1YPixels:: db \1YPixels:: db
\1XStepVector:: db \1XStepVector:: db
@ -242,29 +241,25 @@ spritestatedata1: MACRO
\1AnimFrameCounter:: db \1AnimFrameCounter:: db
\1FacingDirection:: db \1FacingDirection:: db
ds 6 ds 6
\1SpriteStateData1End:: \1End::
endm endm
spritestatedata1 Player wSpritePlayerStateData1:: spritestatedata1 wSpritePlayerStateData1
spritestatedata1 Sprite01 wSprite01StateData1:: spritestatedata1 wSprite01StateData1
spritestatedata1 Sprite02 wSprite02StateData1:: spritestatedata1 wSprite02StateData1
spritestatedata1 Sprite03 wSprite03StateData1:: spritestatedata1 wSprite03StateData1
spritestatedata1 Sprite04 wSprite04StateData1:: spritestatedata1 wSprite04StateData1
spritestatedata1 Sprite05 wSprite05StateData1:: spritestatedata1 wSprite05StateData1
spritestatedata1 Sprite06 wSprite06StateData1:: spritestatedata1 wSprite06StateData1
spritestatedata1 Sprite07 wSprite07StateData1:: spritestatedata1 wSprite07StateData1
spritestatedata1 Sprite08 wSprite08StateData1:: spritestatedata1 wSprite08StateData1
spritestatedata1 Sprite09 wSprite09StateData1:: spritestatedata1 wSprite09StateData1
spritestatedata1 Sprite10 wSprite10StateData1:: spritestatedata1 wSprite10StateData1
spritestatedata1 Sprite11 wSprite11StateData1:: spritestatedata1 wSprite11StateData1
spritestatedata1 Sprite12 wSprite12StateData1:: spritestatedata1 wSprite12StateData1
spritestatedata1 Sprite13 wSprite13StateData1:: spritestatedata1 wSprite13StateData1
spritestatedata1 Sprite14 wSprite14StateData1:: spritestatedata1 wSprite14StateData1
spritestatedata1 Sprite15 wSprite15StateData1:: spritestatedata1 wSprite15StateData1
; ds $10 * $10
;SECTION "Sprite State Data 2", WRAM0[$c200]
wSpriteStateData2:: ; c200 wSpriteStateData2:: ; c200
; more data for all sprites on the current map ; more data for all sprites on the current map
@ -287,7 +282,6 @@ wSpriteStateData2:: ; c200
; C2xE: sprite image base offset (in video ram, player always has value 1, used to compute c1x2) ; C2xE: sprite image base offset (in video ram, player always has value 1, used to compute c1x2)
; C2xF ; C2xF
spritestatedata2: MACRO spritestatedata2: MACRO
\1SpriteStateData2::
\1WalkAnimationCounter:: db \1WalkAnimationCounter:: db
ds 1 ds 1
\1YDisplacement:: db \1YDisplacement:: db
@ -300,26 +294,26 @@ spritestatedata2: MACRO
ds 5 ds 5
\1SpriteImageBaseOffset:: db \1SpriteImageBaseOffset:: db
ds 1 ds 1
\1SpriteStateData2End:: \1End::
endm endm
spritestatedata2 Player wSpritePlayerStateData2:: spritestatedata2 wSpritePlayerStateData2
spritestatedata2 Sprite01 wSprite01StateData2:: spritestatedata2 wSprite01StateData2
spritestatedata2 Sprite02 wSprite02StateData2:: spritestatedata2 wSprite02StateData2
spritestatedata2 Sprite03 wSprite03StateData2:: spritestatedata2 wSprite03StateData2
spritestatedata2 Sprite04 wSprite04StateData2:: spritestatedata2 wSprite04StateData2
spritestatedata2 Sprite05 wSprite05StateData2:: spritestatedata2 wSprite05StateData2
spritestatedata2 Sprite06 wSprite06StateData2:: spritestatedata2 wSprite06StateData2
spritestatedata2 Sprite07 wSprite07StateData2:: spritestatedata2 wSprite07StateData2
spritestatedata2 Sprite08 wSprite08StateData2:: spritestatedata2 wSprite08StateData2
spritestatedata2 Sprite09 wSprite09StateData2:: spritestatedata2 wSprite09StateData2
spritestatedata2 Sprite10 wSprite10StateData2:: spritestatedata2 wSprite10StateData2
spritestatedata2 Sprite11 wSprite11StateData2:: spritestatedata2 wSprite11StateData2
spritestatedata2 Sprite12 wSprite12StateData2:: spritestatedata2 wSprite12StateData2
spritestatedata2 Sprite13 wSprite13StateData2:: spritestatedata2 wSprite13StateData2
spritestatedata2 Sprite14 wSprite14StateData2:: spritestatedata2 wSprite14StateData2
spritestatedata2 Sprite15 wSprite15StateData2:: spritestatedata2 wSprite15StateData2
; ds $10 * $10
wSpriteDataEnd:: wSpriteDataEnd::