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/celadonmart3.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/celadonmart3.asm')
| -rwxr-xr-x | scripts/celadonmart3.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm index 8874a743..46e58d8c 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/celadonmart3.asm @@ -21,10 +21,10 @@ CeladonMart3TextPointers: ; 48228 (12:4228) dw CeladonMart3Text17 CeladonMart3Text1: ; 4824a (12:424a) - db $08 ; asm + TX_ASM ld a, [wd778] bit 7, a - jr nz, .asm_a5463 ; 0x48250 + jr nz, .asm_a5463 ld hl, TM18PreReceiveText call PrintText ld bc, (TM_18 << 8) | 1 @@ -33,13 +33,13 @@ CeladonMart3Text1: ; 4824a (12:424a) ld hl, wd778 set 7, [hl] ld hl, ReceivedTM18Text - jr .asm_81359 ; 0x48268 + jr .asm_81359 .BagFull ld hl, TM18NoRoomText - jr .asm_81359 ; 0x4826d -.asm_a5463 ; 0x4826f + jr .asm_81359 +.asm_a5463 ld hl, TM18ExplanationText -.asm_81359 ; 0x48272 +.asm_81359 call PrintText jp TextScriptEnd |