From 61edd43974bf53aaacf96a355ebf2d1e35b59c91 Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Thu, 9 Apr 2015 01:17:56 +0200
Subject: Document DisableEffect and CheckEnemyStatusConditions

basically copy/paste comments and labels from
CheckPlayerStatusConditions
---
 wram.asm | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'wram.asm')

diff --git a/wram.asm b/wram.asm
index ee7d2afe..8e1c8e48 100755
--- a/wram.asm
+++ b/wram.asm
@@ -432,16 +432,22 @@ wSafariBaitFactor:: ; cce9
 
 wcceb:: ds 1
 wccec:: ds 1
-wMonIsDisobedient:: ds 1
-wccee:: ds 1
-wccef:: ds 1
+
+wMonIsDisobedient:: ds 1 ; cced
+
+wPlayerDisabledMoveNumber:: ds 1 ; ccee 
+wEnemyDisabledMoveNumber:: ds 1 ; ccef
+
 wccf0:: ds 1
-wPlayerUsedMove:: ds 1
-wEnemyUsedMove:: ds 1
+
+wPlayerUsedMove:: ds 1 ; ccf1
+wEnemyUsedMove:: ds 1 ; ccf2
+
 wccf3:: ds 1
-wMoveDidntMiss:: ds 1
 
-wPartyFoughtCurrentEnemyFlags::
+wMoveDidntMiss:: ds 1 ; ccf4
+
+wPartyFoughtCurrentEnemyFlags:: ; ccf5
 ; flags that indicate which party members have fought the current enemy mon
 	flag_array 6
 
@@ -1066,11 +1072,13 @@ W_PLAYERCONFUSEDCOUNTER:: ; wd06b
 W_PLAYERTOXICCOUNTER:: ; d06c
 	ds 1
 W_PLAYERDISABLEDMOVE:: ; d06d
+; high nibble: which move is disabled (1-4)
+; low nibble: disable turns left
 	ds 1
 
 	ds 1
 
-wEnemyNumAttacksLeft::
+wEnemyNumAttacksLeft:: ; d06f
 ; when the enemy is attacking multiple times, the number of attacks left
 	ds 1
 
@@ -1080,6 +1088,8 @@ W_ENEMYCONFUSEDCOUNTER:: ; wd070
 W_ENEMYTOXICCOUNTER:: ; d071
 	ds 1
 W_ENEMYDISABLEDMOVE:: ; d072
+; high nibble: which move is disabled (1-4)
+; low nibble: disable turns left
 	ds 1
 
 	ds 1
-- 
cgit v1.2.3


From 9739c26ed7fa89492cbc8609445d292ced48ee65 Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Thu, 9 Apr 2015 13:05:57 +0200
Subject: money won and trainer pic constants

---
 wram.asm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'wram.asm')

diff --git a/wram.asm b/wram.asm
index 8e1c8e48..91b864d9 100755
--- a/wram.asm
+++ b/wram.asm
@@ -949,8 +949,9 @@ W_TRAINERCLASS:: ; d031
 
 	ds 1
 
-wd033:: ds 1
-wd034:: ds 2
+wTrainerPicPointer:: ; wd033
+	ds 2
+	ds 1
 wd036:: ds 16
 wd046:: ds 1
 wd047:: ds 1
@@ -1103,15 +1104,16 @@ wPlayerBideAccumulatedDamage:: ; d074
 wUnknownSerialCounter2:: ; d075
 ; 2 bytes
 
-ds 4
+	ds 4
 
 wEscapedFromBattle::
 ; non-zero when an item or move that allows escape from battle was used
 	ds 1
 
-wd079:: ds 1
+wd079:: 
+wAmountMoneyWon:: ds 1 ; wd079 - wd07b
 wd07a:: ds 1
-wd07b:: ds 1
+	ds 1
 
 W_ANIMATIONID:: ; d07c
 ; ID number of the current battle animation
-- 
cgit v1.2.3