diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 10:38:20 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 16:05:19 -0400 |
| commit | 1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329 (patch) | |
| tree | 0981af81f93d33b07cbfe47674d87ae4aa2d46b0 /scripts/route5gate.asm | |
| parent | 82ffb336a975fe8cf9c3953fc380339feaae65b3 (diff) | |
| parent | d218d1972a9be5b9d0025a17842239e1fbf5b622 (diff) | |
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
main.asm
text.asm
text/maps/route_22.asm
Diffstat (limited to 'scripts/route5gate.asm')
| -rwxr-xr-x | scripts/route5gate.asm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index f6f1eb1a..ea5feda0 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -26,9 +26,7 @@ Route5GateScript0: ; 1df50 (7:5f50) ld [$d528], a xor a ld [H_CURRENTPRESSEDBUTTONS], a - ld b, BANK(RemoveGuardDrink) - ld hl, RemoveGuardDrink - call Bankswitch + callba RemoveGuardDrink ld a, [$ff00+$db] and a jr nz, .asm_1df82 ; 0x1df70 $10 @@ -75,9 +73,7 @@ Route5GateText1: ; 1dfaa (7:5faa) ld a, [$d728] bit 6, a jr nz, .asm_88856 ; 0x1dfb0 $2c - ld b, BANK(RemoveGuardDrink) - ld hl, RemoveGuardDrink - call Bankswitch + callba RemoveGuardDrink ld a, [$ff00+$db] and a jr nz, .asm_768a2 ; 0x1dfbd $11 |