Identify some hSpriteDataOffset values

This commit is contained in:
Rangi 2020-08-30 16:33:14 -04:00
parent 6ee9cb9f97
commit b506214f68
3 changed files with 15 additions and 15 deletions

View file

@ -80,7 +80,7 @@ SetSpriteFacingDirectionAndDelay::
jp DelayFrames jp DelayFrames
SetSpriteFacingDirection:: SetSpriteFacingDirection::
ld a, $9 ld a, SPRITESTATEDATA1_FACINGDIRECTION
ldh [hSpriteDataOffset], a ldh [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1 call GetPointerWithinSpriteStateData1
ldh a, [hSpriteFacingDirection] ldh a, [hSpriteFacingDirection]
@ -88,7 +88,7 @@ SetSpriteFacingDirection::
ret ret
SetSpriteImageIndexAfterSettingFacingDirection:: SetSpriteImageIndexAfterSettingFacingDirection::
ld de, -7 ld de, SPRITESTATEDATA1_IMAGEINDEX - SPRITESTATEDATA1_FACINGDIRECTION
add hl, de add hl, de
ld [hl], a ld [hl], a
ret ret
@ -158,11 +158,11 @@ CheckBoulderCoords::
jp CheckCoords jp CheckCoords
GetPointerWithinSpriteStateData1:: GetPointerWithinSpriteStateData1::
ld h, $c1 ld h, HIGH(wSpriteStateData1)
jr _GetPointerWithinSpriteStateData jr _GetPointerWithinSpriteStateData
GetPointerWithinSpriteStateData2:: GetPointerWithinSpriteStateData2::
ld h, $c2 ld h, HIGH(wSpriteStateData2)
_GetPointerWithinSpriteStateData: _GetPointerWithinSpriteStateData:
ldh a, [hSpriteDataOffset] ldh a, [hSpriteDataOffset]

View file

@ -84,10 +84,10 @@ ENDC
jr z, .asm_19535 jr z, .asm_19535
ld a, $1 ld a, $1
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
ld a, $5 ld a, SPRITESTATEDATA2_MAPX
ldh [hSpriteDataOffset], a ldh [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData2 call GetPointerWithinSpriteStateData2
ld [hl], $19 ld [hl], 25
.asm_19535 .asm_19535
ld a, HS_CERULEAN_RIVAL ld a, HS_CERULEAN_RIVAL
ld [wMissableObjectIndex], a ld [wMissableObjectIndex], a

View file

@ -255,19 +255,19 @@ OaksLabScript8:
push hl push hl
ld a, $1 ld a, $1
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
ld a, $4 ld a, SPRITESTATEDATA1_YPIXELS
ldh [hSpriteDataOffset], a ldh [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1 call GetPointerWithinSpriteStateData1
push hl push hl
ld [hl], $4c ld [hl], $4c ; SPRITESTATEDATA1_YPIXELS
inc hl inc hl
inc hl inc hl
ld [hl], $0 ld [hl], $0 ; SPRITESTATEDATA1_XPIXELS
pop hl pop hl
inc h inc h
ld [hl], $8 ld [hl], 8 ; SPRITESTATEDATA2_MAPY
inc hl inc hl
ld [hl], $9 ld [hl], 9 ; SPRITESTATEDATA2_MAPX
ld de, .LeftBallMovement2 ; the rival is not currently onscreen, so account for that ld de, .LeftBallMovement2 ; the rival is not currently onscreen, so account for that
pop hl pop hl
jr .moveBlue jr .moveBlue
@ -841,13 +841,13 @@ OaksLabText39:
OaksLabScript_1d157: OaksLabScript_1d157:
ld a, $5 ld a, $5
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
ld a, $9 ld a, SPRITESTATEDATA1_FACINGDIRECTION
ldh [hSpriteDataOffset], a ldh [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1 call GetPointerWithinSpriteStateData1
ld [hl], SPRITE_FACING_DOWN ld [hl], SPRITE_FACING_DOWN
ld a, $1 ld a, $1
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
ld a, $9 ld a, SPRITESTATEDATA1_FACINGDIRECTION
ldh [hSpriteDataOffset], a ldh [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1 call GetPointerWithinSpriteStateData1
ld [hl], SPRITE_FACING_RIGHT ld [hl], SPRITE_FACING_RIGHT
@ -948,10 +948,10 @@ OaksLabReceivedMonText:
OaksLabScript_1d22d: OaksLabScript_1d22d:
ld a, $5 ld a, $5
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
ld a, $9 ld a, SPRITESTATEDATA1_FACINGDIRECTION
ldh [hSpriteDataOffset], a ldh [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1 call GetPointerWithinSpriteStateData1
ld [hl], $0 ld [hl], SPRITE_FACING_DOWN
ld hl, OaksLabLastMonText ld hl, OaksLabLastMonText
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd