diff options
| author | IIMarckus <iimarckus@gmail.com> | 2014-10-20 18:56:21 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2014-10-20 18:56:21 -0600 |
| commit | 5459477ecd3c60342f31881343bc921b41b94eb0 (patch) | |
| tree | aed48bfac6aee9ccad16d3de004c1014550bacd5 /scripts/seafoamislands2.asm | |
| parent | 519dd7fd56c4688ead80e444d945fc188cea5b66 (diff) | |
| parent | 0991bd3abed50f4d249da1ef38d77cd5cd39a77e (diff) | |
Merge branch 'master' of https://github.com/dannye/pokered
Diffstat (limited to 'scripts/seafoamislands2.asm')
| -rwxr-xr-x | scripts/seafoamislands2.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/seafoamislands2.asm b/scripts/seafoamislands2.asm index e392620a..66fe9297 100755 --- a/scripts/seafoamislands2.asm +++ b/scripts/seafoamislands2.asm @@ -12,16 +12,16 @@ SeafoamIslands2Script: ; 46315 (11:6315) cp $1 jr nz, .asm_46340 ; 0x46330 $e set 0, [hl] - ld a, $d9 + ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1 ld [wd079], a - ld a, $db + ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1 ld [wd07a], a jr .asm_4634c ; 0x4633e $c .asm_46340 set 1, [hl] - ld a, $da + ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2 ld [wd079], a - ld a, $dc + ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2 ld [wd07a], a .asm_4634c ld a, [wd079] |