diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-11-25 17:53:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-25 16:53:29 -0600 |
| commit | e92d1af478c8381fde30f709c2619abe90104d3a (patch) | |
| tree | 7be135926706fabcf23d2b278378d0fdd7f7eda7 /ram | |
| parent | Use `ld_hli_a_string` macro to make byte-by-byte strings more obvious (#540) (diff) | |
| download | pokeyellow-e92d1af478c8381fde30f709c2619abe90104d3a.tar.gz pokeyellow-e92d1af478c8381fde30f709c2619abe90104d3a.tar.xz pokeyellow-e92d1af478c8381fde30f709c2619abe90104d3a.zip | |
Avoid magic numbers for most `CopyData` calls (#542)
Diffstat (limited to 'ram')
| -rw-r--r-- | ram/vram.asm | 6 | ||||
| -rw-r--r-- | ram/wram.asm | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/ram/vram.asm b/ram/vram.asm index fafb5d8e..0819fe0a 100644 --- a/ram/vram.asm +++ b/ram/vram.asm @@ -12,8 +12,8 @@ NEXTU ; battle/menu vSprites:: ds $80 tiles vFont:: ds $80 tiles -vFrontPic:: ds 7 * 7 tiles -vBackPic:: ds 7 * 7 tiles +vFrontPic:: ds PIC_SIZE tiles +vBackPic:: ds PIC_SIZE tiles NEXTU ; overworld @@ -25,7 +25,7 @@ NEXTU ; title ds $80 tiles vTitleLogo:: ds $80 tiles - ds 7 * 7 tiles + ds PIC_SIZE tiles vTitleLogo2:: ds 30 tiles ENDU diff --git a/ram/wram.asm b/ram/wram.asm index ff7d10ae..0b00d272 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -191,7 +191,7 @@ wOverworldMap:: ds 1300 wOverworldMapEnd:: NEXTU -wTempPic:: ds 7 * 7 tiles +wTempPic:: ds PIC_SIZE tiles ENDU @@ -688,7 +688,11 @@ NEXTU ds 1 ; difference in X between the next ball and the current one wHUDPokeballGfxOffsetX:: db -wHUDGraphicsTiles:: ds 3 +wHUDGraphicsTiles:: +wHUDUnusedTopTile:: db +wHUDCornerTile:: db +wHUDTriangleTile:: db +wHUDGraphicsTilesEnd:: NEXTU ; the level of the mon at the time it entered day care @@ -1079,7 +1083,7 @@ wExpAmountGained:: dw wGainBoostedExp:: db ENDU -wGymCityName:: ds 17 +wGymCityName:: ds GYM_CITY_LENGTH wGymLeaderName:: ds NAME_LENGTH |