diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
| commit | ec4c53559379f3bf7bd332905ba144e1d998f38b (patch) | |
| tree | f8ee8f2d9c8042b55edb1a4761833511ab1695b1 /scripts/route2gate.asm | |
| parent | c43c338a5f7d90494b7e6e67c6533288bd28117d (diff) | |
| parent | 5d9d26bd5c64a5b11021bdd46e2e0786ddef888d (diff) | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'scripts/route2gate.asm')
| -rwxr-xr-x | scripts/route2gate.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/route2gate.asm b/scripts/route2gate.asm index 8ee087c8..e8d02321 100755 --- a/scripts/route2gate.asm +++ b/scripts/route2gate.asm @@ -6,30 +6,30 @@ Route2GateTextPointers: ; 5d5d7 (17:55d7) dw Route2GateText2 Route2GateText1: ; 5d5db (17:55db) - db $08 ; asm + TX_ASM ld a, [wd7c2] bit 0, a - jr nz, .asm_6592c ; 0x5d5e1 + jr nz, .asm_5d60d ld a, 10 ; pokemon needed - ldh [$db], a + ld [$ffdb], a ld a, HM_05 ; oak's aide reward - ldh [$dc], a + ld [$ffdc], a ld [wd11e], a - call GetItemName ; $2fcf + call GetItemName ld hl, wcd6d ld de, wcc5b ld bc, $000d call CopyData predef OaksAideScript ; call oak's aide script - ldh a, [$db] + ld a, [$ffdb] cp $1 - jr nz, .asm_ad646 ; 0x5d606 + jr nz, .asm_5d613 ld hl, wd7c2 set 0, [hl] -.asm_6592c ; 0x5d60d +.asm_5d60d ld hl, Route2GateText_5d616 call PrintText -.asm_ad646 ; 0x5d613 +.asm_5d613 jp TextScriptEnd Route2GateText_5d616: ; 5d616 (17:5616) |