diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /scripts/museum1f.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/museum1f.asm')
| -rwxr-xr-x | scripts/museum1f.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index ac552c6d..780c3905 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -4,7 +4,7 @@ Museum1FScript: ; 5c0f7 (17:40f7) xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, Museum1FScriptPointers - ld a, [W_MUSEUM1FCURSCRIPT] + ld a, [wMuseum1fCurScript] jp CallFunctionInTable Museum1FScriptPointers: ; 5c109 (17:4109) @@ -12,13 +12,13 @@ Museum1FScriptPointers: ; 5c109 (17:4109) dw Museum1FScript1 Museum1FScript0: ; 5c10d (17:410d) - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $9 jr z, .asm_5c120 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $a ret nz .asm_5c120 @@ -40,17 +40,17 @@ Museum1FTextPointers: ; 5c12b (17:412b) Museum1FText1: ; 5c135 (17:4135) TX_ASM - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 jr nz, .asm_8774b - ld a, [W_XCOORD] + ld a, [wXCoord] cp $d jp z, Museum1FScript_5c1f9 jr .asm_b8709 .asm_8774b cp $3 jr nz, .asm_d49e7 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $c jp z, Museum1FScript_5c1f9 .asm_d49e7 @@ -120,7 +120,7 @@ Museum1FText1: ; 5c135 (17:4135) jr Museum1FScriptEnd .asm_0b094 ld a, $1 - ld [W_MUSEUM1FCURSCRIPT], a + ld [wMuseum1fCurScript], a jr Museum1FScriptEnd Museum1FScript_5c1f9: ; 5c1f9 (17:41f9) |