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 /home | |
| 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 'home')
| -rw-r--r-- | home/copy_string.asm | 8 | ||||
| -rw-r--r-- | home/give.asm | 4 | ||||
| -rw-r--r-- | home/list_menu.asm | 2 | ||||
| -rw-r--r-- | home/vcopy.asm | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/home/copy_string.asm b/home/copy_string.asm index 7f86e501..05f9ba80 100644 --- a/home/copy_string.asm +++ b/home/copy_string.asm @@ -1,9 +1,9 @@ -; copies a string from [de] to [wcf4b] -CopyStringToCF4B:: - ld hl, wcf4b +; copies a string from de to wStringBuffer +CopyToStringBuffer:: + ld hl, wStringBuffer ; fall through -; copies a string from [de] to [hl] +; copies a string from de to hl CopyString:: ld a, [de] inc de diff --git a/home/give.asm b/home/give.asm index cbfd0310..f446cf36 100644 --- a/home/give.asm +++ b/home/give.asm @@ -1,6 +1,6 @@ GiveItem:: ; Give player quantity c of item b, -; and copy the item's name to wcf4b. +; and copy the item's name to wStringBuffer. ; Return carry on success. ld a, b ld [wd11e], a @@ -11,7 +11,7 @@ GiveItem:: call AddItemToInventory ret nc call GetItemName - call CopyStringToCF4B + call CopyToStringBuffer scf ret diff --git a/home/list_menu.asm b/home/list_menu.asm index f0480460..a7398135 100644 --- a/home/list_menu.asm +++ b/home/list_menu.asm @@ -157,7 +157,7 @@ DisplayListMenuIDLoop:: call GetPartyMonName .storeChosenEntry ; store the menu entry that the player chose and return ld de, wcd6d - call CopyStringToCF4B ; copy name to wcf4b + call CopyToStringBuffer ld a, CHOSE_MENU_ITEM ld [wMenuExitMethod], a ld a, [wCurrentMenuItem] diff --git a/home/vcopy.asm b/home/vcopy.asm index 4a80d261..3b26cf1d 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -347,7 +347,7 @@ UpdateMovingBgTiles:: ldh a, [hTileAnimations] and a - ret z ; no animations if indoors (or if a menu set this to 0) + ret z ldh a, [rLY] cp $90 ; check if not in vblank period??? (maybe if vblank is too long) @@ -390,7 +390,7 @@ UpdateMovingBgTiles:: ldh a, [hTileAnimations] rrca ret nc -; if in a cave, no flower animations + xor a ldh [hMovingBGTilesCounter1], a ret |