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 /ram | |
| 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 'ram')
| -rw-r--r-- | ram/wram.asm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ram/wram.asm b/ram/wram.asm index a70a981f..b3d5dd5e 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1064,6 +1064,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 @@ -1079,7 +1080,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 @@ -1239,7 +1241,7 @@ wPartyMenuBlkPacket:: ds $30 NEXTU ds 29 ; storage buffer for various strings -wStringBuffer:: ds 20 +wStringBuffer:: ds NAME_BUFFER_LENGTH NEXTU ds 29 @@ -1381,7 +1383,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. @@ -2393,12 +2395,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 |