Identify wSpriteStateData1 and wSpriteStateData2 offsets, like pokeyellow

This commit is contained in:
Rangi 2020-07-05 17:29:11 -04:00
parent 7ab43f4d17
commit 2b2ed54bbf
62 changed files with 182 additions and 179 deletions

View file

@ -16,7 +16,7 @@ BillsHouseScript0:
ret
BillsHouseScript1:
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
and a ; cp SPRITE_FACING_DOWN
ld de, MovementData_1e79c
jr nz, .notDown

View file

@ -50,7 +50,7 @@ CeruleanCityScript0:
.asm_194e6
ld [wPlayerMovingDirection], a
ld a, b
ld [wSpriteStateData1 + 2 * $10 + $9], a
ld [wSprite02StateData1FacingDirection], a
call Delay3
ld a, $2
ld [hSpriteIndexOrTextID], a

View file

@ -35,7 +35,7 @@ CinnabarIslandScript0:
ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates
xor a
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
ld a, $1
ld [wCinnabarIslandCurScript], a

View file

@ -84,7 +84,7 @@ CopycatsHouse2FText6:
CopycatsHouse2FText7:
text_asm
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ld hl, CopycatsHouse2FText_5cd1c
jr nz, .notUp

View file

@ -492,17 +492,17 @@ OaksLabScript14:
cp $4
jr nz, .turnPlayerLeft
ld a, SPRITE_FACING_RIGHT
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
jr .done
.turnPlayerLeft
ld a, SPRITE_FACING_LEFT
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
jr .done
.turnPlayerDown
cp $4
ret nz
xor a ; ld a, SPRITE_FACING_DOWN
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
.done
ret

View file

@ -94,7 +94,7 @@ PalletTownScript3:
bit 0, a
ret nz
xor a ; ld a, SPRITE_FACING_DOWN
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
ld a, 1
ld [wcf0d], a
ld a, $FC

View file

@ -46,7 +46,7 @@ Mansion1ReplaceBlock:
ret
Mansion1Script_Switches::
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
xor a

View file

@ -42,7 +42,7 @@ Mansion2Script_5202f:
predef_jump ReplaceTileBlock
Mansion2Script_Switches::
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
xor a

View file

@ -73,7 +73,7 @@ Mansion3Script_5225b:
ret
Mansion3Script_Switches::
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
xor a

View file

@ -44,7 +44,7 @@ Mansion4Script_523cf:
ret
Mansion4Script_Switches::
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
xor a

View file

@ -75,7 +75,7 @@ PokemonTower6Script4:
ld a, $10
ld [wSimulatedJoypadStatesEnd], a
xor a
ld [wSpriteStateData2 + $06], a
ld [wSpritePlayerStateData2MovementByte1], a
ld [wOverrideSimulatedJoypadStatesMask], a
ld hl, wd730
set 7, [hl]

View file

@ -70,7 +70,7 @@ PokemonTower7Script4:
ld [wMissableObjectIndex], a
predef HideObject
ld a, SPRITE_FACING_UP
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
ld a, MR_FUJIS_HOUSE
ld [hWarpDestinationMap], a
ld a, $1

View file

@ -51,7 +51,7 @@ MomHealText2:
RedsHouse1FText2: ; TV
text_asm
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ld hl, TVWrongSideText
jr nz, .notUp

View file

@ -314,7 +314,7 @@ RocketHideout2Script3:
ret
LoadSpinnerArrowTiles::
ld a, [wSpriteStateData1 + 2]
ld a, [wSpritePlayerStateData1ImageIndex]
srl a
srl a
ld hl, SpinnerPlayerFacingDirections
@ -322,7 +322,7 @@ LoadSpinnerArrowTiles::
ld b, $0
add hl, bc
ld a, [hl]
ld [wSpriteStateData1 + 2], a
ld [wSpritePlayerStateData1ImageIndex], a
ld a, [wCurMapTileset]
cp FACILITY
ld hl, FacilitySpinnerArrows

View file

@ -47,7 +47,7 @@ Route11GateUpstairsText_494a3:
Route11GateUpstairsText3:
text_asm
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
jp nz, GateUpstairsScript_PrintIfFacingUp
CheckEvent EVENT_BEAT_ROUTE12_SNORLAX

View file

@ -65,7 +65,7 @@ Route12GateUpstairsText_495c4:
text_end
GateUpstairsScript_PrintIfFacingUp:
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
jr z, .up
ld a, $1

View file

@ -149,7 +149,7 @@ Route22Script2:
ld a, [wIsInBattle]
cp $ff
jp z, Route22Script_50ece
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
and a ; cp SPRITE_FACING_DOWN
jr nz, .notDown
ld a, SPRITE_FACING_UP

View file

@ -37,7 +37,7 @@ Route22GateScript_1e6ba:
ld [wSimulatedJoypadStatesIndex], a
ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
jp StartSimulatingJoypadStates

View file

@ -118,7 +118,7 @@ Route23Script_512d8:
ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a
xor a
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
jp StartSimulatingJoypadStates

View file

@ -60,7 +60,7 @@ Route6GateScript_1e0a1:
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
xor a
ld [wSpriteStateData2 + $06], a
ld [wSpritePlayerStateData2MovementByte1], a
ld [wOverrideSimulatedJoypadStatesMask], a
ret

View file

@ -17,7 +17,7 @@ Route7GateScript_1e111:
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
xor a
ld [wSpriteStateData2 + $06], a
ld [wSpritePlayerStateData2MovementByte1], a
ld [wOverrideSimulatedJoypadStatesMask], a
ret

View file

@ -16,7 +16,7 @@ Route8GateScript_1e1d7:
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
xor a
ld [wSpriteStateData2 + $06], a
ld [wSpritePlayerStateData2MovementByte1], a
ld [wOverrideSimulatedJoypadStatesMask], a
ret

View file

@ -25,7 +25,7 @@ SafariZoneGate_ScriptPointers:
xor a
ld [hJoyHeld], a
ld a, SPRITE_FACING_RIGHT
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
ld a, [wCoordIndex]
cp $1
jr z, .asm_7520f
@ -231,7 +231,7 @@ SafariZoneGate_TextPointers:
ld hl, .SafariZoneEntranceText_753bb
call PrintText
xor a
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
ld a, D_DOWN
ld c, $3
call SafariZoneEntranceAutoWalk
@ -243,7 +243,7 @@ SafariZoneGate_TextPointers:
ld hl, .SafariZoneEntranceText_753c0
call PrintText
ld a, SPRITE_FACING_UP
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
ld a, D_UP
ld c, $1
call SafariZoneEntranceAutoWalk

View file

@ -109,7 +109,7 @@ SeafoamIslands4Script2:
dec a
ld [wSimulatedJoypadStatesIndex], a
xor a
ld [wSpriteStateData2 + $06], a
ld [wSpritePlayerStateData2MovementByte1], a
ld hl, wd730
set 7, [hl]
ld hl, wFlags_D733

View file

@ -14,20 +14,20 @@ TradeCenter_Script:
bit 0, [hl]
set 0, [hl]
ret nz
ld hl, wSpriteStateData2 + $14
ld hl, wSprite01StateData2MapY
ld a, $8
ld [hli], a
ld a, $a
ld [hl], a
ld a, SPRITE_FACING_LEFT
ld [wSpriteStateData1 + $19], a
ld [wSprite01StateData1FacingDirection], a
ld a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
ret z
ld a, $7
ld [wSpriteStateData2 + $15], a
ld [wSprite01StateData2MapX], a
ld a, SPRITE_FACING_RIGHT
ld [wSpriteStateData1 + $19], a
ld [wSprite01StateData1FacingDirection], a
ret
TradeCenter_TextPointers:

View file

@ -38,7 +38,7 @@ VermilionCity_ScriptPointers:
dw VermilionCityScript4
VermilionCityScript0:
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
and a ; cp SPRITE_FACING_DOWN
ret nz
ld hl, SSAnneTicketCheckCoords
@ -157,7 +157,7 @@ VermilionCityText3:
text_asm
CheckEvent EVENT_SS_ANNE_LEFT
jr nz, .shipHasDeparted
ld a, [wSpriteStateData1 + 9]
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_RIGHT
jr z, .greetPlayer
ld hl, .inFrontOfOrBehindGuardCoords

View file

@ -21,7 +21,7 @@ VermilionDock_Script:
ld a, $3
ld [wSimulatedJoypadStatesIndex], a
xor a
ld [wSpriteStateData2 + $06], a
ld [wSpritePlayerStateData2MovementByte1], a
ld [wOverrideSimulatedJoypadStatesMask], a
dec a
ld [wJoyIgnore], a
@ -47,7 +47,7 @@ VermilionDock_1db9b:
call PlayMusic
callba LoadSmokeTileFourTimes
xor a
ld [wSpriteStateData1 + 2], a
ld [wSpritePlayerStateData1ImageIndex], a
ld c, 120
call DelayFrames
ld b, $9c

View file

@ -120,7 +120,7 @@ ViridianCityScript_190cf:
ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a
xor a
ld [wSpriteStateData1 + 9], a
ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
ret