More battle code cleanup.

- Use more substatus constants.
- Reformat some code to be more atomic.
- Add constants for unused status prevention held item effects.
- Remove pointless or redundant comments.

1 files changed, 10 insertions, 2 deletions

diff --git a/wram.asm b/wram.asm
index 829b88a5e..3c7520fce 100644
--- a/wram.asm
+++ b/wram.asm
@@ -552,7 +552,11 @@ LinkBattleRNCount:: ; c6e5
 CurEnemyMoveNum:: ; c6e9
 	ds 1
 
-	ds 10
+	ds 2
+
+wPayDayMoney:: ds 3 ; c6ec
+
+	ds 5
 
 AlreadyDisobeyed:: ; c6f4
 	ds 1
@@ -1176,8 +1180,12 @@ OTPartyMon6:: party_struct OTPartyMon6 ; d378
 OTPartyMonOT:: ds NAME_LENGTH * PARTY_LENGTH ; d3a8
 OTPartyMonNicknames:: ds PKMN_NAME_LENGTH * PARTY_LENGTH ; d3ea
 
+	ds 4
+
+wBattleAction:: ds 1 ; d430
+
+	ds 1
 
-SECTION "Map Events", WRAMX[$d432], BANK[1]
 MapStatus:: ; d432
 	ds 1
 MapEventStatus:: ; d433