diff options
Diffstat (limited to 'home/text.asm')
| -rw-r--r-- | home/text.asm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/home/text.asm b/home/text.asm index ad0c4fd8..3b6e229c 100644 --- a/home/text.asm +++ b/home/text.asm @@ -62,7 +62,7 @@ PlaceNextChar:: cp "<NEXT>" jr nz, .NotNext ld bc, 2 * SCREEN_WIDTH - ldh a, [hFlagsFFF6] + ldh a, [hFlagsFFFA] bit 2, a jr z, .ok ld bc, SCREEN_WIDTH @@ -239,6 +239,13 @@ Paragraph:: jp NextChar PageChar:: + ldh a, [hFlagsFFFA] + bit 3, a + jr z, .pageChar + ld a, "<NEXT>" + jp PlaceNextChar.NotTerminator + +.pageChar push de ld a, "▼" ldcoord_a 18, 16 @@ -516,7 +523,7 @@ TextCommand_SOUND:: jr .loop .play - cp TX_SOUND_CRY_NIDORINA + cp TX_SOUND_CRY_PIKACHU jr z, .pokemonCry cp TX_SOUND_CRY_PIDGEOT jr z, .pokemonCry @@ -546,9 +553,9 @@ TextCommandSounds:: db TX_SOUND_GET_ITEM_2, SFX_GET_ITEM_2 db TX_SOUND_GET_KEY_ITEM, SFX_GET_KEY_ITEM db TX_SOUND_DEX_PAGE_ADDED, SFX_DEX_PAGE_ADDED - db TX_SOUND_CRY_NIDORINA, NIDORINA ; used in OakSpeech - db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityText12 - db TX_SOUND_CRY_DEWGONG, DEWGONG ; unused + db TX_SOUND_CRY_PIKACHU, STARTER_PIKACHU ; used in OakSpeech + db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityText12 + db TX_SOUND_CRY_DEWGONG, DEWGONG ; unused TextCommand_DOTS:: ; wait for button press or 30 frames while printing "…"s |