summaryrefslogtreecommitdiff
path: root/scripts/OaksLab.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/OaksLab.asm')
-rwxr-xr-xscripts/OaksLab.asm126
1 files changed, 63 insertions, 63 deletions
diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm
index 01196d7c..49017440 100755
--- a/scripts/OaksLab.asm
+++ b/scripts/OaksLab.asm
@@ -48,7 +48,7 @@ OaksLabScript0:
OaksLabScript1:
ld a, $8
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld de, OakEntryMovement
call MoveSprite
@@ -86,14 +86,14 @@ OaksLabScript3:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
xor a
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $5
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
xor a
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $4
@@ -111,9 +111,9 @@ OaksLabScript4:
SetEvent EVENT_FOLLOWED_OAK_INTO_LAB
SetEvent EVENT_FOLLOWED_OAK_INTO_LAB_2
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld a, SPRITE_FACING_UP
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
call UpdateSprites
ld hl, wFlags_D733
@@ -128,19 +128,19 @@ OaksLabScript5:
ld a, $fc
ld [wJoyIgnore], a
ld a, $11
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld a, $12
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld a, $13
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld a, $14
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_OAK_ASKED_TO_CHOOSE_MON
xor a
@@ -155,18 +155,18 @@ OaksLabScript6:
cp $6
ret nz
ld a, $5
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
xor a
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
call UpdateSprites
ld a, $c
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
@@ -254,9 +254,9 @@ OaksLabScript8:
jr nz, .moveBlue
push hl
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld a, $4
- ld [hSpriteDataOffset], a
+ ldh [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
push hl
ld [hl], $4c
@@ -281,7 +281,7 @@ OaksLabScript8:
.moveBlue
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
call MoveSprite
ld a, $9
@@ -295,12 +295,12 @@ OaksLabScript9:
ld a, $fc
ld [wJoyIgnore], a
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld a, SPRITE_FACING_UP
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $d
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, [wRivalStarterBallSpriteIndex]
cp $2
@@ -324,12 +324,12 @@ OaksLabScript9:
ld [wd11e], a
call GetMonName
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld a, SPRITE_FACING_UP
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $e
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_GOT_STARTER
xor a
@@ -344,9 +344,9 @@ OaksLabScript10:
cp $6
ret nz
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a
@@ -354,21 +354,21 @@ OaksLabScript10:
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $f
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
- ld [hNPCPlayerRelativePosPerspective], a
+ ldh [hNPCPlayerRelativePosPerspective], a
ld a, $1
swap a
- ld [hNPCSpriteOffset], a
+ ldh [hNPCSpriteOffset], a
predef CalcPositionOfPlayerRelativeToNPC
- ld a, [hNPCPlayerYDistance]
+ ldh a, [hNPCPlayerYDistance]
dec a
- ld [hNPCPlayerYDistance], a
+ ldh [hNPCPlayerYDistance], a
predef FindPathToPlayer
ld de, wNPCMovementDirections2
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
call MoveSprite
ld a, $b
@@ -424,9 +424,9 @@ OaksLabScript12:
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
predef HealParty
SetEvent EVENT_BATTLED_RIVAL_IN_OAKS_LAB
@@ -439,11 +439,11 @@ OaksLabScript13:
ld c, 20
call DelayFrames
ld a, $10
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
callba Music_RivalAlternateStart
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld de, .RivalExitMovement
call MoveSprite
ld a, [wXCoord]
@@ -508,14 +508,14 @@ OaksLabScript14:
OaksLabScript15:
xor a
- ld [hJoyHeld], a
+ ldh [hJoyHeld], a
call EnableAutoTextBoxDrawing
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $15
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
call OaksLabScript_1d02b
ld a, HS_OAKS_LAB_RIVAL
@@ -530,7 +530,7 @@ OaksLabScript15:
call FillMemory
ld [hl], $ff
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld de, wNPCMovementDirections2
call MoveSprite
@@ -540,14 +540,14 @@ OaksLabScript15:
OaksLabScript_1cefd:
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld a, SPRITE_FACING_UP
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $8
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
jp SetSpriteFacingDirectionAndDelay
OaksLabScript16:
@@ -560,21 +560,21 @@ OaksLabScript16:
ld [wJoyIgnore], a
call OaksLabScript_1cefd
ld a, $16
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
call DelayFrame
call OaksLabScript_1cefd
ld a, $17
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
call DelayFrame
call OaksLabScript_1cefd
ld a, $18
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
call DelayFrame
ld a, $19
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld a, HS_POKEDEX_1
@@ -585,16 +585,16 @@ OaksLabScript16:
predef HideObject
call OaksLabScript_1cefd
ld a, $1a
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld a, SPRITE_FACING_RIGHT
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
call Delay3
ld a, $1b
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_GOT_POKEDEX
SetEvent EVENT_OAK_GOT_PARCEL
@@ -616,7 +616,7 @@ OaksLabScript16:
call PlaySound
callba Music_RivalAlternateStart
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld de, wNPCMovementDirections2
call MoveSprite
@@ -672,9 +672,9 @@ OaksLabScript_RemoveParcel:
OaksLabScript_1d02b:
ld a, $7c
- ld [hSpriteScreenYCoord], a
+ ldh [hSpriteScreenYCoord], a
ld a, $8
- ld [hSpriteMapXCoord], a
+ ldh [hSpriteMapXCoord], a
ld a, [wYCoord]
cp $3
jr nz, .asm_1d045
@@ -703,9 +703,9 @@ OaksLabScript_1d02b:
.asm_1d066
ld a, $20
.asm_1d068
- ld [hSpriteScreenXCoord], a
+ ldh [hSpriteScreenXCoord], a
ld a, b
- ld [hSpriteMapYCoord], a
+ ldh [hSpriteMapYCoord], a
ld a, $1
ld [wSpriteIndex], a
call SetSpritePosition1
@@ -840,15 +840,15 @@ OaksLabText39:
OaksLabScript_1d157:
ld a, $5
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld a, $9
- ld [hSpriteDataOffset], a
+ ldh [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
ld [hl], SPRITE_FACING_DOWN
ld a, $1
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld a, $9
- ld [hSpriteDataOffset], a
+ ldh [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
ld [hl], SPRITE_FACING_RIGHT
ld hl, wd730
@@ -947,9 +947,9 @@ OaksLabReceivedMonText:
OaksLabScript_1d22d:
ld a, $5
- ld [hSpriteIndex], a
+ ldh [hSpriteIndex], a
ld a, $9
- ld [hSpriteDataOffset], a
+ ldh [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
ld [hl], $0
ld hl, OaksLabLastMonText