diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-07 19:48:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 19:48:22 -0400 |
| commit | 9571c550b6a0dcb3a4f54513c881661a87271024 (patch) | |
| tree | d73507228a57e4f3cece2fb93fe7df3a9439553f /scripts/CeruleanGym.asm | |
| parent | c480632d5494d04f7f5f0298a31877a2293b564e (diff) | |
| parent | bbf2f51a02b2544f1bef32a5868503b474ae2fef (diff) | |
Merge pull request #263 from Rangi42/master
Syncing style with pokecrystal
Diffstat (limited to 'scripts/CeruleanGym.asm')
| -rwxr-xr-x | scripts/CeruleanGym.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index 14363066..ef3c96f5 100755 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -44,20 +44,20 @@ CeruleanGymScript3: CeruleanGymScript_5c70d: ld a, $5 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_MISTY lb bc, TM_BUBBLEBEAM, 1 call GiveItem jr nc, .BagFull ld a, $6 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM11 jr .gymVictory .BagFull ld a, $7 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID .gymVictory ld hl, wObtainedBadges @@ -121,14 +121,14 @@ CeruleanGymText1: ld hl, CeruleanGymText_5c7d8 ld de, CeruleanGymText_5c7d8 call SaveEndBattleTextPointers - ld a, [hSpriteIndex] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $2 ld [wGymLeaderNo], a xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $3 ld [wCeruleanGymCurScript], a .done |