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 /scripts/PalletTown.asm | |
| parent | 2718c36065e7eb201a149938bcdd51987c4e56b6 (diff) | |
| parent | 5fe8aab3445cb76d8e1c4be954c0392f40798950 (diff) | |
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'scripts/PalletTown.asm')
| -rwxr-xr-x | scripts/PalletTown.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index ff500ca0..e063e0c8 100755 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -94,7 +94,7 @@ PalletTownScript3: bit 0, a ret nz xor a ; ld a, SPRITE_FACING_DOWN - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld a, 1 ld [wcf0d], a ld a, $FC @@ -158,7 +158,7 @@ PalletTown_TextPointers: dw PalletTownText7 PalletTownText1: - TX_ASM + text_asm ld a, [wcf0d] and a jr nz, .next @@ -173,8 +173,8 @@ PalletTownText1: jp TextScriptEnd OakAppearsText: - TX_FAR _OakAppearsText - TX_ASM + text_far _OakAppearsText + text_asm ld c, 10 call DelayFrames xor a @@ -186,29 +186,29 @@ OakAppearsText: jp TextScriptEnd OakWalksUpText: - TX_FAR _OakWalksUpText - db "@" + text_far _OakWalksUpText + text_end PalletTownText2: ; girl - TX_FAR _PalletTownText2 - db "@" + text_far _PalletTownText2 + text_end PalletTownText3: ; fat man - TX_FAR _PalletTownText3 - db "@" + text_far _PalletTownText3 + text_end PalletTownText4: ; sign by lab - TX_FAR _PalletTownText4 - db "@" + text_far _PalletTownText4 + text_end PalletTownText5: ; sign by fence - TX_FAR _PalletTownText5 - db "@" + text_far _PalletTownText5 + text_end PalletTownText6: ; sign by Red’s house - TX_FAR _PalletTownText6 - db "@" + text_far _PalletTownText6 + text_end PalletTownText7: ; sign by Blue’s house - TX_FAR _PalletTownText7 - db "@" + text_far _PalletTownText7 + text_end |