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/saffronhouse2.asm | |
| parent | c43c338a5f7d90494b7e6e67c6533288bd28117d (diff) | |
| parent | 5d9d26bd5c64a5b11021bdd46e2e0786ddef888d (diff) | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'scripts/saffronhouse2.asm')
| -rwxr-xr-x | scripts/saffronhouse2.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/saffronhouse2.asm b/scripts/saffronhouse2.asm index 727fd981..b7d8ed26 100755 --- a/scripts/saffronhouse2.asm +++ b/scripts/saffronhouse2.asm @@ -5,10 +5,10 @@ SaffronHouse2TextPointers: ; 1de3f (7:5e3f) dw SaffronHouse2Text1 SaffronHouse2Text1: ; 1de41 (7:5e41) - db $08 ; asm + TX_ASM ld a, [wd7bd] bit 0, a - jr nz, .asm_9e72b ; 0x1de47 + jr nz, .asm_9e72b ld hl, TM29PreReceiveText call PrintText ld bc,(TM_29 << 8) | 1 @@ -18,15 +18,15 @@ SaffronHouse2Text1: ; 1de41 (7:5e41) call PrintText ld hl, wd7bd set 0, [hl] - jr .asm_fe4e1 ; 0x1de62 + jr .asm_fe4e1 .BagFull ld hl, TM29NoRoomText call PrintText - jr .asm_fe4e1 ; 0x1de6a -.asm_9e72b ; 0x1de6c + jr .asm_fe4e1 +.asm_9e72b ld hl, TM29ExplanationText call PrintText -.asm_fe4e1 ; 0x1de72 +.asm_fe4e1 jp TextScriptEnd TM29PreReceiveText: ; 1de75 (7:5e75) |