summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authoreinstein95 <einstein95@users.noreply.github.com>2016-10-07 13:55:17 +1300
committereinstein95 <einstein95@users.noreply.github.com>2016-10-07 13:57:43 +1300
commite95485a8b0eacac8806c5948079919a271029897 (patch)
tree9b18d4c9f946d31390685f3185f91a3f35d613d2 /wram.asm
parentfe3ea5c3f8cf36ef475fe19924590d8bc1af0952 (diff)
More fixes, most from iimarckus
Diffstat (limited to 'wram.asm')
-rwxr-xr-xwram.asm11
1 files changed, 8 insertions, 3 deletions
diff --git a/wram.asm b/wram.asm
index 31a6aef9..e99de2e1 100755
--- a/wram.asm
+++ b/wram.asm
@@ -1319,6 +1319,8 @@ wAIItem:: ; cf05
wUsedItemOnWhichPokemon:: ; cf05
ds 1
+ ds 5
+
wAnimSoundID:: ; cf07
; sound ID during battle animations
ds 1
@@ -1608,10 +1610,11 @@ wEnemyMonLevel:: db
wEnemyMonMaxHP:: dw
wEnemyMonAttack:: dw
wEnemyMonDefense:: dw
-wEnemyMonSpeed:: dw
+wEnemyMonSpeed:: ds 1
+SECTION "WRAM Bank 1", WRAMX, BANK[1]
+ ds 1
wEnemyMonSpecial:: dw
wEnemyMonPP:: ds 2 ; NUM_MOVES - 2
-SECTION "WRAM Bank 1", WRAMX, BANK[1]
ds 2 ; NUM_MOVES - 2
wEnemyMonBaseStats:: ds 5
@@ -3118,7 +3121,9 @@ wSecondLockTrashCanIndex:: ; d743
ds 2
wEventFlags:: ; d747
- ds 320
+ ds 73
+wd795::
+ ds 247
wLinkEnemyTrainerName:: ; d887
; linked game's trainer name