diff options
| author | dannye <33dannye@gmail.com> | 2025-11-12 17:56:10 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-11-12 17:56:10 -0600 |
| commit | 324ae167d15ae4eef3cda411e10201661e57d88d (patch) | |
| tree | 86c2b73ce1262f12c1b3eb82874e8572e80e583f /engine/items | |
| parent | Separate surfing Pikachu graphics from audio engine code (diff) | |
| parent | Use features of RGBDS 1.0.0 (#537) (diff) | |
| download | pokeyellow-324ae167d15ae4eef3cda411e10201661e57d88d.tar.gz pokeyellow-324ae167d15ae4eef3cda411e10201661e57d88d.tar.xz pokeyellow-324ae167d15ae4eef3cda411e10201661e57d88d.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/item_effects.asm | 4 | ||||
| -rw-r--r-- | engine/items/town_map.asm | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 1bbb4cf9..31684719 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -2441,7 +2441,7 @@ ItemUseTMHM: .chooseMon ld hl, wStringBuffer ld de, wTempMoveNameBuffer - ld bc, 14 + ld bc, ITEM_NAME_LENGTH + 1 call CopyData ; save the move name because DisplayPartyMenu will overwrite it ld a, $ff ld [wUpdateSpritesEnabled], a @@ -2451,7 +2451,7 @@ ItemUseTMHM: push af ld hl, wTempMoveNameBuffer ld de, wStringBuffer - ld bc, 14 + ld bc, ITEM_NAME_LENGTH + 1 call CopyData pop af jr nc, .checkIfAbleToLearnMove diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index 3cf68aea..a7093cfc 100644 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm @@ -57,7 +57,7 @@ DisplayTownMap: ld a, [hli] ld [de], a inc de - cp "@" + cp '@' jr nz, .copyMapName hlcoord 1, 0 ld de, wNameBuffer @@ -176,7 +176,7 @@ LoadTownMap_Fly:: ld hl, wFlyLocationsList decoord 18, 0 .townMapFlyLoop - ld a, " " + ld a, ' ' ld [de], a push hl push hl @@ -193,9 +193,9 @@ LoadTownMap_Fly:: ld c, 15 call DelayFrames hlcoord 18, 0 - ld [hl], "▲" + ld [hl], '▲' hlcoord 19, 0 - ld [hl], "▼" + ld [hl], '▼' pop hl .inputLoop push hl @@ -373,7 +373,7 @@ DrawPlayerOrBirdSprite: ld a, [hli] ld [de], a inc de - cp "@" + cp '@' jr nz, .loop ld hl, wShadowOAM ld de, wShadowOAMBackup |