diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-29 01:04:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-29 01:04:24 -0400 |
| commit | 4ef305907206bdb90c3c9259f6d527a90b26629c (patch) | |
| tree | ed116b29979bb2aeb3a02789aa92d3769278361a /scripts/Museum1F.asm | |
| parent | 48da6c53be768e85b8ba47430e2fc0f3dd4de61e (diff) | |
| parent | 637f38b139c43c15eb1f4a67562a78389d4f42a7 (diff) | |
Merge pull request #290 from Rangi42/master
Separate splash screen, intro, and credits (like pokegold/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 b7240154..ee3473ff 100755 --- a/scripts/Museum1F.asm +++ b/scripts/Museum1F.asm @@ -13,13 +13,13 @@ Museum1F_ScriptPointers: Museum1FScript0: ld a, [wYCoord] - cp $4 + cp 4 ret nz ld a, [wXCoord] - cp $9 + cp 9 jr z, .asm_5c120 ld a, [wXCoord] - cp $a + cp 10 ret nz .asm_5c120 xor a @@ -41,17 +41,17 @@ Museum1F_TextPointers: Museum1FText1: text_asm ld a, [wYCoord] - cp $4 + cp 4 jr nz, .asm_8774b ld a, [wXCoord] - cp $d + cp 13 jp z, Museum1FScript_5c1f9 jr .asm_b8709 .asm_8774b cp $3 jr nz, .asm_d49e7 ld a, [wXCoord] - cp $c + cp 12 jp z, Museum1FScript_5c1f9 .asm_d49e7 CheckEvent EVENT_BOUGHT_MUSEUM_TICKET |