diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
| commit | ce3ec76762d9e2f0c560e2ea7868678418883143 (patch) | |
| tree | 13bd307196f870d59157ab803c858c205eba6921 /home/text.asm | |
| parent | 604eb493c42b457f9e006e2cf67f29c15e0d1d0b (diff) | |
| parent | bcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow into merge-pokeredmerge-pokered
Diffstat (limited to 'home/text.asm')
| -rw-r--r-- | home/text.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/home/text.asm b/home/text.asm index 866eca9f..b3f96315 100644 --- a/home/text.asm +++ b/home/text.asm @@ -60,19 +60,19 @@ PlaceNextChar:: Char4ETest:: cp $4E ; next - jr nz, .next + jr nz, .char4FTest ld bc, 2 * SCREEN_WIDTH ld a, [hFlags_0xFFFA] bit 2, a - jr z, .next2 + jr z, .ok ld bc, SCREEN_WIDTH -.next2 +.ok pop hl add hl, bc push hl jp PlaceNextChar_inc -.next +.char4FTest cp $4F ; line jr nz, .next3 pop hl @@ -256,13 +256,13 @@ Char5F:: Char58:: ; prompt ld a, [wLinkState] cp LINK_STATE_BATTLING - jp z, .next + jp z, .ok ld a, $EE Coorda 18, 16 -.next +.ok call ProtectedDelay3 call ManualTextScroll - ld a, " " ; space + ld a, " " Coorda 18, 16 Char57:: ; done pop hl @@ -393,14 +393,14 @@ NextTextCommand:: ld hl, TextCommandJumpTable push bc add a - ld b, $00 + ld b, 0 ld c, a add hl, bc pop bc ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; draw box ; 04AAAABBCC @@ -521,7 +521,7 @@ TextCommand06:: TextCommand07:: ld a, " " Coorda 18, 16 ; place blank space in lower right corner of dialogue text box - call ScrollTextUpOneLine ; scroll up text + call ScrollTextUpOneLine call ScrollTextUpOneLine pop hl coord bc, 1, 16 ; address of second line of dialogue text box @@ -533,7 +533,7 @@ TextCommand08:: pop hl ld de, NextTextCommand push de ; return address - jp [hl] + jp hl ; print decimal number (converted from binary number) ; 09AAAABB @@ -629,7 +629,7 @@ TextCommandSounds:: db $10, SFX_GET_ITEM_2 db $11, SFX_GET_KEY_ITEM db $13, SFX_TRADE_MACHINE - db $14, PIKACHU ; used in OakSpeech + db $14, PIKACHU ; used in OakSpeech db $15, PIDGEOT ; used in SaffronCityText12 db $16, DEWGONG ; unused? |