diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-05 19:58:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 19:58:21 -0400 |
| commit | c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0 (patch) | |
| tree | 531d6b30d5a606ae963024825ed6e614843000a6 /engine/events/hidden_objects/bills_house_pc.asm | |
| parent | Merge pull request #257 from Rangi42/master (diff) | |
| parent | db $f6 == script_cable_club_receptionist (diff) | |
| download | pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.tar.gz pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.tar.xz pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.zip | |
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'engine/events/hidden_objects/bills_house_pc.asm')
| -rw-r--r-- | engine/events/hidden_objects/bills_house_pc.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/events/hidden_objects/bills_house_pc.asm b/engine/events/hidden_objects/bills_house_pc.asm index 836aace0..92679d66 100644 --- a/engine/events/hidden_objects/bills_house_pc.asm +++ b/engine/events/hidden_objects/bills_house_pc.asm @@ -1,6 +1,6 @@ BillsHousePC: call EnableAutoTextBoxDrawing - ld a, [wSpriteStateData1 + 9] + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP ret nz CheckEvent EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING @@ -45,13 +45,13 @@ BillsHousePC: ret BillsHouseMonitorText:: - TX_FAR _BillsHouseMonitorText - db "@" + text_far _BillsHouseMonitorText + text_end BillsHouseInitiatedText:: - TX_FAR _BillsHouseInitiatedText - TX_BLINK - TX_ASM + text_far _BillsHouseInitiatedText + text_promptbutton + text_asm ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound @@ -65,7 +65,7 @@ BillsHouseInitiatedText:: jp TextScriptEnd BillsHousePokemonList:: - TX_ASM + text_asm call SaveScreenTilesToBuffer1 ld hl, BillsHousePokemonListText1 call PrintText @@ -119,8 +119,8 @@ BillsHousePokemonList:: jp TextScriptEnd BillsHousePokemonListText1: - TX_FAR _BillsHousePokemonListText1 - db "@" + text_far _BillsHousePokemonListText1 + text_end BillsMonListText: db "EEVEE" @@ -130,5 +130,5 @@ BillsMonListText: next "CANCEL@" BillsHousePokemonListText2: - TX_FAR _BillsHousePokemonListText2 - db "@" + text_far _BillsHousePokemonListText2 + text_end |