diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-30 16:33:14 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-30 16:33:14 -0400 |
| commit | b506214f68b3b6cfc75e40373b29961af7cbd6f2 (patch) | |
| tree | 708574e9136364c14f7c4cd3095dba1fb3c3b623 | |
| parent | 6ee9cb9f97b31604c7133782d4401bbf5b64f2d8 (diff) | |
Identify some hSpriteDataOffset values
| -rw-r--r-- | home/map_objects.asm | 8 | ||||
| -rwxr-xr-x | scripts/CeruleanCity.asm | 4 | ||||
| -rwxr-xr-x | scripts/OaksLab.asm | 18 |
3 files changed, 15 insertions, 15 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index 02555e35..27a69965 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -80,7 +80,7 @@ SetSpriteFacingDirectionAndDelay:: jp DelayFrames SetSpriteFacingDirection:: - ld a, $9 + ld a, SPRITESTATEDATA1_FACINGDIRECTION ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData1 ldh a, [hSpriteFacingDirection] @@ -88,7 +88,7 @@ SetSpriteFacingDirection:: ret SetSpriteImageIndexAfterSettingFacingDirection:: - ld de, -7 + ld de, SPRITESTATEDATA1_IMAGEINDEX - SPRITESTATEDATA1_FACINGDIRECTION add hl, de ld [hl], a ret @@ -158,11 +158,11 @@ CheckBoulderCoords:: jp CheckCoords GetPointerWithinSpriteStateData1:: - ld h, $c1 + ld h, HIGH(wSpriteStateData1) jr _GetPointerWithinSpriteStateData GetPointerWithinSpriteStateData2:: - ld h, $c2 + ld h, HIGH(wSpriteStateData2) _GetPointerWithinSpriteStateData: ldh a, [hSpriteDataOffset] diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index 5ac75075..7505cb20 100755 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -84,10 +84,10 @@ ENDC jr z, .asm_19535 ld a, $1 ldh [hSpriteIndex], a - ld a, $5 + ld a, SPRITESTATEDATA2_MAPX ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData2 - ld [hl], $19 + ld [hl], 25 .asm_19535 ld a, HS_CERULEAN_RIVAL ld [wMissableObjectIndex], a diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 0eab35aa..0df74dcf 100755 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -255,19 +255,19 @@ OaksLabScript8: push hl ld a, $1 ldh [hSpriteIndex], a - ld a, $4 + ld a, SPRITESTATEDATA1_YPIXELS ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData1 push hl - ld [hl], $4c + ld [hl], $4c ; SPRITESTATEDATA1_YPIXELS inc hl inc hl - ld [hl], $0 + ld [hl], $0 ; SPRITESTATEDATA1_XPIXELS pop hl inc h - ld [hl], $8 + ld [hl], 8 ; SPRITESTATEDATA2_MAPY inc hl - ld [hl], $9 + ld [hl], 9 ; SPRITESTATEDATA2_MAPX ld de, .LeftBallMovement2 ; the rival is not currently onscreen, so account for that pop hl jr .moveBlue @@ -841,13 +841,13 @@ OaksLabText39: OaksLabScript_1d157: ld a, $5 ldh [hSpriteIndex], a - ld a, $9 + ld a, SPRITESTATEDATA1_FACINGDIRECTION ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData1 ld [hl], SPRITE_FACING_DOWN ld a, $1 ldh [hSpriteIndex], a - ld a, $9 + ld a, SPRITESTATEDATA1_FACINGDIRECTION ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData1 ld [hl], SPRITE_FACING_RIGHT @@ -948,10 +948,10 @@ OaksLabReceivedMonText: OaksLabScript_1d22d: ld a, $5 ldh [hSpriteIndex], a - ld a, $9 + ld a, SPRITESTATEDATA1_FACINGDIRECTION ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData1 - ld [hl], $0 + ld [hl], SPRITE_FACING_DOWN ld hl, OaksLabLastMonText call PrintText jp TextScriptEnd |