diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-12 18:32:42 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-12 18:32:42 -0700 |
| commit | 023cfdbb051ea5184ebc7fa329db3ca43f1ca23e (patch) | |
| tree | 0f91ce5ba8d243080fbe58a7f0e1a97949ba6c1a /home/battle.asm | |
| parent | 23f9b5d21e93f1b3c8de5e4ecf72da89265ccea8 (diff) | |
Consolidate monster structs in wram and sram.
The PartyMon struct is really the box struct with volatile variables like status added.
Some other labels have been reworked.
Move structs no longer have explicit labels since their location is arbitrary and usually shared.
Diffstat (limited to 'home/battle.asm')
| -rw-r--r-- | home/battle.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/battle.asm b/home/battle.asm index fc670d927..809b0d843 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -250,10 +250,10 @@ _GetBattleVar:: ; 39e7 dw PlayerSubStatus4, EnemySubStatus4 dw PlayerSubStatus5, EnemySubStatus5 dw BattleMonStatus, EnemyMonStatus - dw PlayerMoveAnimation, EnemyMoveAnimation - dw PlayerMoveEffect, EnemyMoveEffect - dw PlayerMovePower, EnemyMovePower - dw PlayerMoveType, EnemyMoveType + dw wPlayerMoveStruct + MOVE_ANIM, wEnemyMoveStruct + MOVE_ANIM + dw wPlayerMoveStruct + MOVE_EFFECT, wEnemyMoveStruct + MOVE_EFFECT + dw wPlayerMoveStruct + MOVE_POWER, wEnemyMoveStruct + MOVE_POWER + dw wPlayerMoveStruct + MOVE_TYPE, wEnemyMoveStruct + MOVE_TYPE dw CurPlayerMove, CurEnemyMove dw LastEnemyCounterMove, LastPlayerCounterMove dw LastPlayerMove, LastEnemyMove |