diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
| commit | cb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch) | |
| tree | e44bd6299c61335a9a0476db57b565aadcd0b4d7 /scripts/museum1f.asm | |
| parent | 2ea331ebb341505df1cd8429b140c52e345a5af4 (diff) | |
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
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 ac552c6d..75dc1ce8 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -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 |