diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /engine/events | |
| parent | Switch from Travis CI to GitHub Actions (diff) | |
| parent | Fix typos (#334) (diff) | |
| download | pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/cinnabar_lab.asm | 2 | ||||
| -rw-r--r-- | engine/events/give_pokemon.asm | 2 | ||||
| -rw-r--r-- | engine/events/pokemart.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm index bccc95d1..7cbb2cd5 100644 --- a/engine/events/cinnabar_lab.asm +++ b/engine/events/cinnabar_lab.asm @@ -116,7 +116,7 @@ LoadFossilItemAndMonName:: ld a, [wFossilMon] ld [wd11e], a call GetMonName - call CopyStringToCF4B + call CopyToStringBuffer ld a, [wFossilItem] ld [wd11e], a call GetItemName diff --git a/engine/events/give_pokemon.asm b/engine/events/give_pokemon.asm index a65f65cc..00c642bb 100644 --- a/engine/events/give_pokemon.asm +++ b/engine/events/give_pokemon.asm @@ -18,7 +18,7 @@ _GivePokemon:: callfar LoadEnemyMonData call SetPokedexOwnedFlag callfar SendNewMonToBox - ld hl, wcf4b + ld hl, wStringBuffer ld a, [wCurrentBoxNum] and $7f cp 9 diff --git a/engine/events/pokemart.asm b/engine/events/pokemart.asm index c7cb8115..a1d69c72 100644 --- a/engine/events/pokemart.asm +++ b/engine/events/pokemart.asm @@ -159,7 +159,7 @@ DisplayPokemartDialogue_:: ld a, [wcf91] ; item ID ld [wd11e], a ; store item ID for GetItemName call GetItemName - call CopyStringToCF4B ; copy name to wcf4b + call CopyToStringBuffer ld hl, PokemartTellBuyPriceText call PrintText hlcoord 14, 7 |