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/Museum1F.asm | |
| parent | Merge pull request #262 from Rangi42/master (diff) | |
| parent | Move all code out of home.asm into home/ (diff) | |
| download | pokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.tar.gz pokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.tar.xz pokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.zip | |
Merge pull request #263 from Rangi42/master
Syncing style with pokecrystal
Diffstat (limited to 'scripts/Museum1F.asm')
| -rwxr-xr-x | scripts/Museum1F.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/Museum1F.asm b/scripts/Museum1F.asm index a8a609ff..caec03be 100755 --- a/scripts/Museum1F.asm +++ b/scripts/Museum1F.asm @@ -23,9 +23,9 @@ Museum1FScript0: ret nz .asm_5c120 xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID Museum1FScript1: @@ -71,7 +71,7 @@ Museum1FText1: ld [wTextBoxID], a call DisplayTextBoxID xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld hl, Museum1FText_5c21f call PrintText call YesNoChoice @@ -79,10 +79,10 @@ Museum1FText1: and a jr nz, .asm_de133 xor a - ld [hMoney], a - ld [hMoney + 1], a + ldh [hMoney], a + ldh [hMoney + 1], a ld a, $50 - ld [hMoney + 2], a + ldh [hMoney + 2], a call HasEnoughMoney jr nc, .asm_0f3e3 ld hl, Museum1FText_5c229 |