aboutsummaryrefslogtreecommitdiffstats
path: root/ram
diff options
context:
space:
mode:
authorRangi <sylvie.oukaour+rangi42@gmail.com>2025-09-26 16:55:23 -0400
committerRangi <sylvie.oukaour+rangi42@gmail.com>2025-09-26 16:55:23 -0400
commit628797baffe7ea7dd4b224116d9704c7ae1b9c29 (patch)
treec018e77ef1f05cf777f3349f04165a1c78d2dc3d /ram
parentClean up home/copy2.asm (#531) (diff)
downloadpokeyellow-628797baffe7ea7dd4b224116d9704c7ae1b9c29.tar.gz
pokeyellow-628797baffe7ea7dd4b224116d9704c7ae1b9c29.tar.xz
pokeyellow-628797baffe7ea7dd4b224116d9704c7ae1b9c29.zip
Revise some RAM buffer constants
Diffstat (limited to 'ram')
-rw-r--r--ram/wram.asm12
1 files changed, 7 insertions, 5 deletions
diff --git a/ram/wram.asm b/ram/wram.asm
index 504eb646..0121b065 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -890,6 +890,7 @@ wDownscaledMonSize::
; FormatMovesString stores the number of moves minus one here
wNumMovesMinusOne:: db
+; This union spans 20 bytes.
UNION
; storage buffer for various name strings
wNameBuffer:: ds NAME_BUFFER_LENGTH
@@ -905,7 +906,8 @@ wPayDayMoney:: ds 3
NEXTU
; evolution data for one mon
-wEvoDataBuffer:: ds 4 * 3 + 1 ; enough for Eevee's three 4-byte evolutions and 0 terminator
+wEvoDataBuffer:: ds NUM_EVOS_IN_BUFFER * 4 + 1 ; enough for Eevee's three 4-byte evolutions and 0 terminator
+wEvoDataBufferEnd::
NEXTU
wBattleMenuCurrentPP:: db
@@ -1068,7 +1070,7 @@ wPartyMenuBlkPacket:: ds $30
NEXTU
ds 29
; storage buffer for various strings
-wStringBuffer:: ds 20
+wStringBuffer:: ds NAME_BUFFER_LENGTH
NEXTU
ds 29
@@ -1206,7 +1208,7 @@ wTrainerPicPointer:: dw
ds 1
UNION
-wTempMoveNameBuffer:: ds 14
+wTempMoveNameBuffer:: ds ITEM_NAME_LENGTH + 1
NEXTU
; The name of the mon that is learning a move.
@@ -2136,12 +2138,12 @@ wEventFlags:: flag_array NUM_EVENTS
UNION
wGrassRate:: db
-wGrassMons:: ds 10 * 2
+wGrassMons:: ds WILDDATA_LENGTH - 1
ds 8
wWaterRate:: db
-wWaterMons:: ds 10 * 2
+wWaterMons:: ds WILDDATA_LENGTH - 1
NEXTU
; linked game's trainer name