summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
Diffstat (limited to 'wram.asm')
-rw-r--r--[-rwxr-xr-x]wram.asm35
1 files changed, 19 insertions, 16 deletions
diff --git a/wram.asm b/wram.asm
index 3ebc04a6..2fb889c2 100755..100644
--- a/wram.asm
+++ b/wram.asm
@@ -1998,10 +1998,11 @@ wMonHGrowthRate::
wMonHLearnset::
; bit field
- flag_array 50 + 5
+ flag_array NUM_TMS + NUM_HMS
ds 1
+wMonHeaderEnd::
-wSavedTilesetType::
+wSavedTileAnimations::
; saved at the start of a battle and then written back at the end of the battle
ds 1
@@ -3036,31 +3037,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