thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

H_CONSTANTNAMES -> hConstantNames

Browse source
This commit is contained in:
Rangi 2020-07-03 19:59:41 -04:00
parent 55bb99580e
commit 35deb77113
104 changed files with 1163 additions and 1164 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/BillsHouse.asm
View file

@ -23,7 +23,7 @@ BillsHouseScript1:
ld de, MovementData_1e7a0
.notDown
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, $2
ld [wBillsHouseCurScript], a
@ -80,7 +80,7 @@ BillsHouseScript3:
ld c, 8
call DelayFrames
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld de, MovementData_1e807
call MoveSprite
ld a, $4

2
scripts/CeladonGym.asm
View file

@ -170,7 +170,7 @@ CeladonGymText1:
ld hl, CeladonGymText_48a63
ld de, CeladonGymText_48a63
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

12
scripts/CeruleanCity.asm
View file

@ -79,9 +79,9 @@ CeruleanCityScript0:
cp $14
jr z, .asm_19535
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, $5
ld [H_SPRITEDATAOFFSET], a
ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData2
ld [hl], $19
.asm_19535
@ -90,7 +90,7 @@ CeruleanCityScript0:
predef ShowObject
ld de, CeruleanCityMovement1
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, $1
ld [wCeruleanCityCurScript], a
@ -114,7 +114,7 @@ CeruleanCityMovement1:
CeruleanCityScript_1955d:
ld a, 1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
jp SetSpriteFacingDirectionAndDelay ; face object
@ -176,7 +176,7 @@ CeruleanCityScript2:
call PlaySound
callba Music_RivalAlternateStart
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, [wXCoord]
cp $14
@ -187,7 +187,7 @@ CeruleanCityScript2:
ld de, CeruleanCityMovement3
.asm_195f3
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, $3
ld [wCeruleanCityCurScript], a

2
scripts/CeruleanGym.asm
View file

@ -121,7 +121,7 @@ CeruleanGymText1:
ld hl, CeruleanGymText_5c7d8
ld de, CeruleanGymText_5c7d8
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

16
scripts/ChampionsRoom.asm
View file

@ -101,7 +101,7 @@ GaryScript3:
ld [hSpriteIndexOrTextID], a
call GaryScript_760c8
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, $4
ld [wChampionsRoomCurScript], a
@ -113,11 +113,11 @@ GaryScript4:
ld [hSpriteIndexOrTextID], a
call GaryScript_760c8
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld de, OakEntranceAfterVictoryMovement
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, HS_CHAMPIONS_ROOM_OAK
ld [wMissableObjectIndex], a
@ -141,12 +141,12 @@ GaryScript5:
ld a, PLAYER_DIR_LEFT
ld [wPlayerMovingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -159,7 +159,7 @@ GaryScript5:
GaryScript6:
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_RIGHT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -172,7 +172,7 @@ GaryScript6:
GaryScript7:
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -181,7 +181,7 @@ GaryScript7:
call GaryScript_760c8
ld de, OakExitGaryRoomMovement
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, $8
ld [wChampionsRoomCurScript], a

2
scripts/CinnabarGym.asm
View file

@ -50,7 +50,7 @@ CinnabarGymScript0:
ld a, [wOpponentAfterWrongAnswer]
and a
ret z
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
cp $4
jr nz, .asm_757c3
ld a, PLAYER_DIR_DOWN

4
scripts/FightingDojo.asm
View file

@ -43,7 +43,7 @@ FightingDojoScript1:
ld a, PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -62,7 +62,7 @@ FightingDojoScript3:
ld a, PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay

2
scripts/FuchsiaGym.asm
View file

@ -161,7 +161,7 @@ FuchsiaGymText1:
ld hl, KogaAfterBattleText
ld de, KogaAfterBattleText
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

6
scripts/GameCorner.asm
View file

@ -60,7 +60,7 @@ CeladonGameCornerScript1:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $b
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld de, MovementData_48c5a
ld a, [wYCoord]
@ -75,7 +75,7 @@ CeladonGameCornerScript1:
ld de, MovementData_48c63
.asm_48c4d
ld a, $b
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, $2
ld [wGameCornerCurScript], a
@ -418,7 +418,7 @@ CeladonGameCornerText11:
ld hl, CeladonGameCornerText_48ed3
ld de, CeladonGameCornerText_48ed3
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

2
scripts/HallOfFame.asm
View file

@ -79,7 +79,7 @@ HallofFameRoomScript1:
ld a, PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a

6
scripts/MtMoonB2F.asm
View file

@ -88,7 +88,7 @@ MtMoon3Script3:
MtMoon3Script4:
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld hl, CoordsData_49dea
call ArePlayerCoordsInArray
@ -102,7 +102,7 @@ MtMoon3Script4:
ld de, MovementData_49df8
.asm_49dda
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, $5
ld [wMtMoonB2FCurScript], a
@ -222,7 +222,7 @@ MtMoon3Text1:
ld hl, MtMoon3Text_49f8a
ld de, MtMoon3Text_49f8a
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

52
scripts/OaksLab.asm
View file

@ -48,7 +48,7 @@ OaksLabScript0:
OaksLabScript1:
ld a, $8
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld de, OakEntryMovement
call MoveSprite
@ -86,12 +86,12 @@ OaksLabScript3:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
xor a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $5
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
xor a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -111,7 +111,7 @@ OaksLabScript4:
SetEvent EVENT_FOLLOWED_OAK_INTO_LAB
SetEvent EVENT_FOLLOWED_OAK_INTO_LAB_2
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -155,12 +155,12 @@ OaksLabScript6:
cp $6
ret nz
ld a, $5
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
xor a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -254,9 +254,9 @@ OaksLabScript8:
jr nz, .moveBlue
push hl
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, $4
ld [H_SPRITEDATAOFFSET], a
ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
push hl
ld [hl], $4c
@ -281,7 +281,7 @@ OaksLabScript8:
.moveBlue
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, $9
@ -295,7 +295,7 @@ OaksLabScript9:
ld a, $fc
ld [wJoyIgnore], a
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -324,7 +324,7 @@ OaksLabScript9:
ld [wd11e], a
call GetMonName
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -344,7 +344,7 @@ OaksLabScript10:
cp $6
ret nz
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -368,7 +368,7 @@ OaksLabScript10:
predef FindPathToPlayer
ld de, wNPCMovementDirections2
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, $b
@ -424,7 +424,7 @@ OaksLabScript12:
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -443,7 +443,7 @@ OaksLabScript13:
call DisplayTextID
callba Music_RivalAlternateStart
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld de, .RivalExitMovement
call MoveSprite
ld a, [wXCoord]
@ -530,7 +530,7 @@ OaksLabScript15:
call FillMemory
ld [hl], $ff
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld de, wNPCMovementDirections2
call MoveSprite
@ -540,12 +540,12 @@ OaksLabScript15:
OaksLabScript_1cefd:
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $8
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
jp SetSpriteFacingDirectionAndDelay
@ -588,7 +588,7 @@ OaksLabScript16:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_RIGHT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -616,7 +616,7 @@ OaksLabScript16:
call PlaySound
callba Music_RivalAlternateStart
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld de, wNPCMovementDirections2
call MoveSprite
@ -840,15 +840,15 @@ OaksLabText39:
OaksLabScript_1d157:
ld a, $5
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, $9
ld [H_SPRITEDATAOFFSET], a
ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
ld [hl], SPRITE_FACING_DOWN
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, $9
ld [H_SPRITEDATAOFFSET], a
ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
ld [hl], SPRITE_FACING_RIGHT
ld hl, wd730
@ -947,9 +947,9 @@ OaksLabReceivedMonText:
OaksLabScript_1d22d:
ld a, $5
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, $9
ld [H_SPRITEDATAOFFSET], a
ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
ld [hl], $0
ld hl, OaksLabLastMonText

6
scripts/PalletTown.asm
View file

@ -61,7 +61,7 @@ PalletTownScript1:
PalletTownScript2:
ld a, 1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -79,7 +79,7 @@ PalletTownScript2:
predef FindPathToPlayer ; load Oak’s movement into wNPCMovementDirections2
ld de, wNPCMovementDirections2
ld a, 1 ; oak
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, $FF
ld [wJoyIgnore], a
@ -111,7 +111,7 @@ PalletTownScript3:
ld [wNPCMovementScriptFunctionNum], a
ld a, 1
ld [wNPCMovementScriptPointerTableNum], a
ld a, [H_LOADEDROMBANK]
ld a, [hLoadedROMBank]
ld [wNPCMovementScriptBank], a
; trigger the next script

12
scripts/PewterCity.asm
View file

@ -44,7 +44,7 @@ PewterCityScript1:
and a
ret nz
ld a, $3
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -69,7 +69,7 @@ PewterCityScript1:
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $3
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld de, MovementData_PewterMuseumGuyExit
call MoveSprite
ld a, $2
@ -112,7 +112,7 @@ PewterCityScript4:
and a
ret nz
ld a, $5
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -137,7 +137,7 @@ PewterCityScript4:
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $5
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld de, MovementData_PewterGymGuyExit
call MoveSprite
ld a, $5
@ -220,7 +220,7 @@ PewterCityText3:
ld [wNPCMovementScriptFunctionNum], a
ld a, $2
ld [wNPCMovementScriptPointerTableNum], a
ld a, [H_LOADEDROMBANK]
ld a, [hLoadedROMBank]
ld [wNPCMovementScriptBank], a
ld a, $3
ld [wSpriteIndex], a
@ -284,7 +284,7 @@ PewterCityText5:
ld [wNPCMovementScriptFunctionNum], a
ld a, $3
ld [wNPCMovementScriptPointerTableNum], a
ld a, [H_LOADEDROMBANK]
ld a, [hLoadedROMBank]
ld [wNPCMovementScriptBank], a
ld a, $5
ld [wSpriteIndex], a

2
scripts/PewterGym.asm
View file

@ -120,7 +120,7 @@ PewterGymText1:
ld hl, PewterGymText_5c4bc
ld de, PewterGymText_5c4bc
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

4
scripts/PokemonTower2F.asm
View file

@ -41,7 +41,7 @@ PokemonTower2Script0:
.asm_60544
ld [wPlayerMovingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, b
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -74,7 +74,7 @@ PokemonTower2Script1:
ld de, MovementData_605a9
.asm_60589
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a

2
scripts/PokemonTower7F.asm
View file

@ -107,7 +107,7 @@ PokemonTower7Script_60db6:
ld d, [hl]
ld e, a
ld a, [wSpriteIndex]
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
jp MoveSprite
.asm_60dde
inc hl

2
scripts/RocketHideoutB4F.asm
View file

@ -125,7 +125,7 @@ RocketHideout4Text1:
ld hl, RocketHideout4Text_4557f
ld de, RocketHideout4Text_4557f
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

16
scripts/Route22.asm
View file

@ -96,7 +96,7 @@ Route22Script0:
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call Route22MoveRivalSprite
ld a, $1
ld [wRoute22CurScript], a
@ -118,7 +118,7 @@ Route22Script1:
.asm_50f7a
ld [hSpriteFacingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteFacingDirectionAndDelay
xor a
ld [wJoyIgnore], a
@ -159,7 +159,7 @@ Route22Script2:
.done
ld [hSpriteFacingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteFacingDirectionAndDelay
ld a, $f0
ld [wJoyIgnore], a
@ -191,7 +191,7 @@ Route22Script_5100d:
ld de, Route22RivalExitMovementData2
Route22MoveRival1:
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
jp MoveSprite
Route22RivalExitMovementData1:
@ -250,7 +250,7 @@ Route22Script_5104e:
call PlaySound
callba Music_RivalAlternateTempo
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call Route22MoveRivalSprite
ld a, $4
ld [wRoute22CurScript], a
@ -261,7 +261,7 @@ Route22Script4:
bit 0, a
ret nz
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, [wcf0d]
cp $1
jr nz, .asm_510a1
@ -305,7 +305,7 @@ Route22Script5:
cp $ff
jp z, Route22Script_50ece
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, [wcf0d]
cp $1
jr nz, .asm_510fb
@ -350,7 +350,7 @@ Route22Script_51142:
ld de, MovementData_5114d
Route22MoveRival2:
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
jp MoveSprite
MovementData_5114c:

8
scripts/SSAnne2F.asm
View file

@ -37,7 +37,7 @@ SSAnne2Script0:
predef ShowObject
call Delay3
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
xor a
ld [hJoyHeld], a
@ -83,7 +83,7 @@ SSAnne2Script_61416:
.asm_61427
ld [hSpriteFacingDirection], a
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
jp SetSpriteFacingDirectionAndDelay
SSAnne2Script1:
@ -132,7 +132,7 @@ SSAnne2Script2:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, [wXCoord]
cp $25
@ -143,7 +143,7 @@ SSAnne2Script2:
ld de, MovementData_614b7
.asm_6149a
ld a, $2
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a

2
scripts/SaffronGym.asm
View file

@ -171,7 +171,7 @@ SaffronGymText1:
ld hl, SaffronGymText_5d167
ld de, SaffronGymText_5d167
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

8
scripts/SilphCo11F.asm
View file

@ -178,7 +178,7 @@ SilphCo11Script0:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $3
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld de, MovementData_62216
call MoveSprite
@ -199,7 +199,7 @@ MovementData_62216:
SilphCo11Script_6221a:
ld [wPlayerMovingDirection], a
ld a, $3
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, b
ld [hSpriteFacingDirection], a
jp SetSpriteFacingDirectionAndDelay
@ -239,7 +239,7 @@ SilphCo11Script3:
bit 0, a
ret nz
ld a, $3
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, [wcf0d]
cp $1
@ -263,7 +263,7 @@ SilphCo11Script4:
ld hl, SilphCo10Text_62330
ld de, SilphCo10Text_62330
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

8
scripts/SilphCo7F.asm
View file

@ -140,7 +140,7 @@ SilphCo7Script0:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $9
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld de, MovementData_51c7d
ld a, [wCoordIndex]
@ -150,7 +150,7 @@ SilphCo7Script0:
inc de
.asm_51c6c
ld a, $9
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, $3
jp SilphCo7Text_51c10
@ -212,7 +212,7 @@ SilphCo7Script4:
ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a
ld a, $9
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@ -230,7 +230,7 @@ SilphCo7Script4:
ld de, MovementData_51d1a
.asm_51d0e
ld a, $9
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call MoveSprite
ld a, $5
jp SilphCo7Text_51c10

2
scripts/TradeCenter.asm
View file

@ -8,7 +8,7 @@ TradeCenter_Script:
.next
ld [hSpriteFacingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld [hSpriteIndex], a
call SetSpriteFacingDirection
ld hl, wd72d
bit 0, [hl]

4
scripts/VermilionDock.asm
View file

@ -57,10 +57,10 @@ VermilionDock_1db9b:
ld a, $14 ; water tile
call FillMemory
ld a, 1
ld [H_AUTOBGTRANSFERENABLED], a
ld [hAutoBGTransferEnabled], a
call Delay3
xor a
ld [H_AUTOBGTRANSFERENABLED], a
ld [hAutoBGTransferEnabled], a
ld [wSSAnneSmokeDriftAmount], a
ld [rOBP1], a
ld a, 88

2
scripts/VermilionGym.asm
View file

@ -150,7 +150,7 @@ LTSurgeText:
ld hl, ReceivedThunderbadgeText
ld de, ReceivedThunderbadgeText
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

2
scripts/ViridianGym.asm
View file

@ -289,7 +289,7 @@ ViridianGymText1:
ld hl, ViridianGymText_74ad3
ld de, ViridianGymText_74ad3
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

2
scripts/WardensHouse.asm
View file

@ -95,7 +95,7 @@ HM04NoRoomText:
FuchsiaHouse2Text5:
FuchsiaHouse2Text4:
TX_ASM
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndex]
cp $4
ld hl, FuchsiaHouse2Text_7517b
jr nz, .asm_4c9a2