diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-07-24 12:21:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-24 12:21:59 -0400 |
| commit | 6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695 (patch) | |
| tree | 32feac5e86fbac9eec6f40c14a19c8bd89c1b52d /engine/items | |
| parent | Identify various flag labels and bit constants (#454) (diff) | |
| download | pokeyellow-6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695.tar.gz pokeyellow-6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695.tar.xz pokeyellow-6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695.zip | |
Identify wcd6d as wNameBuffer and others (#455)
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/item_effects.asm | 4 | ||||
| -rw-r--r-- | engine/items/town_map.asm | 24 |
2 files changed, 15 insertions, 13 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index e771504d..0c339451 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -2493,10 +2493,10 @@ GetMaxPP: ld hl, Moves ld bc, MOVE_LENGTH call AddNTimes - ld de, wcd6d + ld de, wMoveData ld a, BANK(Moves) call FarCopyData - ld de, wcd6d + 5 ; PP is byte 5 of move data + ld de, wMoveData + MOVE_PP ld a, [de] ld b, a ; b = normal max PP pop hl diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index ccbe0225..a9840268 100644 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm @@ -1,5 +1,7 @@ DEF NOT_VISITED EQU $fe +DEF BIRD_BASE_TILE EQU $04 + DisplayTownMap: call LoadTownMap ld hl, wUpdateSpritesEnabled @@ -12,15 +14,15 @@ DisplayTownMap: ld a, [wCurMap] push af ld b, $0 - call DrawPlayerOrBirdSprite ; player sprite + call DrawPlayerOrBirdSprite hlcoord 1, 0 - ld de, wcd6d + ld de, wNameBuffer call PlaceString ld hl, wShadowOAM ld de, wTileMapBackup ld bc, $10 call CopyData - ld hl, vSprites tile $04 + ld hl, vSprites tile BIRD_BASE_TILE ld de, TownMapCursor lb bc, BANK(TownMapCursor), (TownMapCursorEnd - TownMapCursor) / $8 call CopyVideoDataDouble @@ -50,15 +52,15 @@ DisplayTownMap: ld hl, wShadowOAMSprite04 call WriteTownMapSpriteOAM ; town map cursor sprite pop hl - ld de, wcd6d + ld de, wNameBuffer .copyMapName ld a, [hli] ld [de], a inc de - cp $50 + cp "@" jr nz, .copyMapName hlcoord 1, 0 - ld de, wcd6d + ld de, wNameBuffer call PlaceString ld hl, wShadowOAMSprite04 ld de, wTileMapBackup + 16 @@ -142,7 +144,7 @@ LoadTownMap_Fly:: call LoadPlayerSpriteGraphics call LoadFontTilePatterns ld de, BirdSprite - ld hl, vSprites tile $04 + ld hl, vSprites tile BIRD_BASE_TILE lb bc, BANK(BirdSprite), 12 call CopyVideoData ld de, TownMapUpArrow @@ -173,10 +175,10 @@ LoadTownMap_Fly:: call ClearScreenArea pop hl ld a, [hl] - ld b, $4 - call DrawPlayerOrBirdSprite ; draw bird sprite + ld b, BIRD_BASE_TILE + call DrawPlayerOrBirdSprite hlcoord 3, 0 - ld de, wcd6d + ld de, wNameBuffer call PlaceString ld c, 15 call DelayFrames @@ -356,7 +358,7 @@ DrawPlayerOrBirdSprite: call TownMapCoordsToOAMCoords call WritePlayerOrBirdSpriteOAM pop hl - ld de, wcd6d + ld de, wNameBuffer .loop ld a, [hli] ld [de], a |