diff options
Diffstat (limited to 'scripts/PokemonTower7F.asm')
| -rwxr-xr-x | scripts/PokemonTower7F.asm | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm index e34edf66..75e67a72 100755 --- a/scripts/PokemonTower7F.asm +++ b/scripts/PokemonTower7F.asm @@ -49,7 +49,7 @@ PokemonTower7Script_60d2a: ld a, MUSIC_MEET_JESSIE_JAMES call PlayMusic xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $FF ^ (A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, HS_POKEMON_TOWER_7F_JESSIE @@ -59,7 +59,7 @@ PokemonTower7Script_60d2a: ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld a, $4 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a @@ -82,7 +82,7 @@ PokemonTower7Script1: ld de, PokemonTower7MovementData_60d7a .asm_60d8c ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call MoveSprite ld a, $ff ld [wJoyIgnore], a @@ -113,7 +113,7 @@ PokemonTower7Script4: ld de, PokemonTower7MovementData_60d7b .asm_60dcc ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call MoveSprite ld a, $ff ld [wJoyIgnore], a @@ -140,7 +140,7 @@ PokemonTower7Script6: ld a, $FF ^ (A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, $5 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID PokemonTower7Script7: ld hl, wd72d @@ -154,7 +154,7 @@ PokemonTower7Script7: ld a, $2c ld [wTrainerNo], a xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld [wJoyIgnore], a ld a, $8 call PokemonTower7Script_60d05 @@ -177,7 +177,7 @@ PokemonTower7Script8: ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld a, $6 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -209,7 +209,7 @@ PokemonTower7Script9: PokemonTower7Script10: call PlayDefaultMusic xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld [wJoyIgnore], a SetEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 ld a, $0 @@ -223,7 +223,7 @@ PokemonTower7Script_60eaf: call Delay3 ret -PokemonTower7Script_60ebe +PokemonTower7Script_60ebe: ld [wMissableObjectIndex], a predef HideObject ret @@ -237,7 +237,7 @@ PokemonTower7Script11: ld a, SPRITE_FACING_UP ld [wSpritePlayerStateData1FacingDirection], a ld a, MR_FUJIS_HOUSE - ld [hWarpDestinationMap], a + ldh [hWarpDestinationMap], a ld a, $1 ld [wDestinationWarpID], a ld a, LAVENDER_TOWN @@ -258,11 +258,11 @@ PokemonTower7F_TextPointers: PokemonTower7Text1: PokemonTower7Text2: - db "@" + text_end PokemonTower7Text4: - TX_FAR _PokemonTowerJessieJamesText1 - TX_ASM + text_far _PokemonTowerJessieJamesText1 + text_asm ld c, 10 call DelayFrames ld a, PLAYER_DIR_UP @@ -277,22 +277,22 @@ PokemonTower7Text4: jp TextScriptEnd PokemonTower7Text5: - TX_FAR _PokemonTowerJessieJamesText2 - db "@" + text_far _PokemonTowerJessieJamesText2 + text_end PokemonTower7JessieJamesEndBattleText: - TX_FAR _PokemonTowerJessieJamesText3 - db "@" + text_far _PokemonTowerJessieJamesText3 + text_end PokemonTower7Text6: - TX_FAR _PokemonTowerJessieJamesText4 - TX_ASM + text_far _PokemonTowerJessieJamesText4 + text_asm ld c, 64 call DelayFrames jp TextScriptEnd PokemonTower7Text3: - TX_ASM + text_asm ld hl, PokemonTower7Text_60f75 call PrintText SetEvent EVENT_RESCUED_MR_FUJI @@ -311,5 +311,5 @@ PokemonTower7Text3: jp TextScriptEnd PokemonTower7Text_60f75: - TX_FAR _TowerRescueFujiText - db "@" + text_far _TowerRescueFujiText + text_end |