diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-28 17:11:12 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-28 17:11:12 -0500 |
| commit | 6adbaefde14f5e9039aa42a6c96ce476a4107925 (patch) | |
| tree | 321a370bf474d666d3e5368a964b0511f26fd6c1 /wram.asm | |
| parent | Use assert to ensure correct base data size (diff) | |
| download | pokeyellow-6adbaefde14f5e9039aa42a6c96ce476a4107925.tar.gz pokeyellow-6adbaefde14f5e9039aa42a6c96ce476a4107925.tar.xz pokeyellow-6adbaefde14f5e9039aa42a6c96ce476a4107925.zip | |
Keep wGrassMons and wWaterMons together with a UNION
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 30 |
1 files changed, 16 insertions, 14 deletions
@@ -3035,31 +3035,33 @@ wSecondLockTrashCanIndex:: wEventFlags:: flag_array NUM_EVENTS + +UNION +wGrassRate:: db +wGrassMons:: + ds 10 * 2 + + ds 8 + +wWaterRate:: db +wWaterMons:: + ds 10 * 2 + +NEXTU wLinkEnemyTrainerName:: ; linked game's trainer name + ds NAME_LENGTH -wGrassRate:: ds 1 -wGrassMons:: -; ds 20 - - ds 11 -; Overload wGrassMons wSerialEnemyDataBlock:: +; ds $1a8 + ds 9 wEnemyPartyCount:: ds 1 wEnemyPartyMons:: ds PARTY_LENGTH + 1 -; Overload enemy party data -UNION - -wWaterRate:: db -wWaterMons:: db - -NEXTU - wEnemyMons:: wEnemyMon1:: party_struct wEnemyMon1 wEnemyMon2:: party_struct wEnemyMon2 |