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/lavendermart.asm | |
parent | c43c338a5f7d90494b7e6e67c6533288bd28117d (diff) | |
parent | 5d9d26bd5c64a5b11021bdd46e2e0786ddef888d (diff) |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'scripts/lavendermart.asm')
-rwxr-xr-x | scripts/lavendermart.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/lavendermart.asm b/scripts/lavendermart.asm index 3852a235..53967cf2 100755 --- a/scripts/lavendermart.asm +++ b/scripts/lavendermart.asm @@ -11,17 +11,17 @@ LavenderMartText2: ; 5c935 (17:4935) db "@" LavenderMartText3: ; 5c93a (17:493a) - db $08 ; asm + TX_ASM ld a, [wd7e0] bit 7, a - jr nz, .asm_c88d4 ; 0x5c940 + jr nz, .asm_c88d4 ld hl, LavenderMart_5c953 call PrintText - jr .asm_6d225 ; 0x5c948 -.asm_c88d4 ; 0x5c94a + jr .asm_6d225 +.asm_c88d4 ld hl, LavenderMart_5c958 call PrintText -.asm_6d225 ; 0x5c950 +.asm_6d225 jp TextScriptEnd LavenderMart_5c953: ; 5c953 (17:4953) |