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/celadoncity.asm | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| parent | No more ldh (diff) | |
| download | pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.gz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.xz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.zip | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'scripts/celadoncity.asm')
| -rwxr-xr-x | scripts/celadoncity.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm index 004d8773..9107d254 100755 --- a/scripts/celadoncity.asm +++ b/scripts/celadoncity.asm @@ -44,10 +44,10 @@ CeladonCityText4: ; 19999 (6:5999) db "@" CeladonCityText5: ; 1999e (6:599e) - db $08 ; asm + TX_ASM ld a, [wd777] bit 0, a - jr nz, .asm_7053f ; 0x199a4 + jr nz, .asm_7053f ld hl, TM41PreText call PrintText ld bc, (TM_41 << 8) | 1 @@ -62,7 +62,7 @@ CeladonCityText5: ; 1999e (6:599e) ld hl, wd777 set 0, [hl] jr .Done -.asm_7053f ; 0x199c9 +.asm_7053f ld hl, TM41ExplanationText call PrintText .Done @@ -90,7 +90,7 @@ CeladonCityText6: ; 199e7 (6:59e7) CeladonCityText7: ; 199ec (6:59ec) TX_FAR _CeladonCityText7 - db $08 ; asm + TX_ASM ld a, POLIWRATH call PlayCry jp TextScriptEnd |