diff options
| author | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
| commit | 04f7f7f506a1dbb877e4678601261e8157fd0e57 (patch) | |
| tree | bfe62d3872c5f031ee40df9488910bd58b0e1b15 /scripts/PalletTown.asm | |
| parent | Extend tools/pcm.c to allow decoding .pcm to .wav (diff) | |
| parent | Fix some map text constants (diff) | |
| download | pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.gz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.xz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/PalletTown.asm')
| -rw-r--r-- | scripts/PalletTown.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index 07e59cc0..9c8ab449 100644 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -55,7 +55,7 @@ PalletTownOakHeyWaitScript: ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a xor a - ld [wcf0d], a + ld [wOakWalkedToPlayer], a ld a, TEXT_PALLETTOWN_OAK ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -109,7 +109,7 @@ PalletTownOakGreetsPlayerScript: ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, 1 - ld [wcf0d], a + ld [wOakWalkedToPlayer], a ld a, $2 ld [wSprite01StateData1MovementStatus], a ld a, SPRITE_FACING_UP @@ -153,8 +153,8 @@ PalletTownPikachuBattleScript: ret PalletTownAfterPikachuBattleScript: - ld a, $2 - ld [wcf0d], a + ld a, 2 + ld [wOakWalkedToPlayer], a ld a, TEXT_PALLETTOWN_OAK ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -232,7 +232,7 @@ PalletTown_TextPointers: PalletTownOakText: text_asm - ld a, [wcf0d] + ld a, [wOakWalkedToPlayer] and a jr nz, .next ld a, 1 |