diff options
Diffstat (limited to 'home/battle_vars.asm')
| -rw-r--r-- | home/battle_vars.asm | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/home/battle_vars.asm b/home/battle_vars.asm index b66301e78..c4a8dcd70 100644 --- a/home/battle_vars.asm +++ b/home/battle_vars.asm @@ -50,64 +50,64 @@ GetBattleVarAddr:: ; 39e7 BattleVarPairs: ; entries correspond to BATTLE_VARS_* constants - dw .substatus1 - dw .substatus2 - dw .substatus3 - dw .substatus4 - dw .substatus5 - dw .substatus1opp - dw .substatus2opp - dw .substatus3opp - dw .substatus4opp - dw .substatus5opp - dw .status - dw .statusopp - dw .animation - dw .effect - dw .power - dw .type - dw .curmove - dw .lastcounter - dw .lastcounteropp - dw .lastmove - dw .lastmoveopp + dw .Substatus1 + dw .Substatus2 + dw .Substatus3 + dw .Substatus4 + dw .Substatus5 + dw .Substatus1Opp + dw .Substatus2Opp + dw .Substatus3Opp + dw .Substatus4Opp + dw .Substatus5Opp + dw .Status + dw .StatusOpp + dw .MoveAnim + dw .MoveEffect + dw .MovePower + dw .MoveType + dw .CurMove + dw .LastCounter + dw .LastCounterOpp + dw .LastMove + dw .LastMoveOpp ; player enemy -.substatus1: db PLAYER_SUBSTATUS_1, ENEMY_SUBSTATUS_1 -.substatus1opp: db ENEMY_SUBSTATUS_1, PLAYER_SUBSTATUS_1 -.substatus2: db PLAYER_SUBSTATUS_2, ENEMY_SUBSTATUS_2 -.substatus2opp: db ENEMY_SUBSTATUS_2, PLAYER_SUBSTATUS_2 -.substatus3: db PLAYER_SUBSTATUS_3, ENEMY_SUBSTATUS_3 -.substatus3opp: db ENEMY_SUBSTATUS_3, PLAYER_SUBSTATUS_3 -.substatus4: db PLAYER_SUBSTATUS_4, ENEMY_SUBSTATUS_4 -.substatus4opp: db ENEMY_SUBSTATUS_4, PLAYER_SUBSTATUS_4 -.substatus5: db PLAYER_SUBSTATUS_5, ENEMY_SUBSTATUS_5 -.substatus5opp: db ENEMY_SUBSTATUS_5, PLAYER_SUBSTATUS_5 -.status: db PLAYER_STATUS, ENEMY_STATUS -.statusopp: db ENEMY_STATUS, PLAYER_STATUS -.animation: db PLAYER_MOVE_ANIMATION, ENEMY_MOVE_ANIMATION -.effect: db PLAYER_MOVE_EFFECT, ENEMY_MOVE_EFFECT -.power: db PLAYER_MOVE_POWER, ENEMY_MOVE_POWER -.type: db PLAYER_MOVE_TYPE, ENEMY_MOVE_TYPE -.curmove: db PLAYER_CUR_MOVE, ENEMY_CUR_MOVE -.lastcounter: db PLAYER_COUNTER_MOVE, ENEMY_COUNTER_MOVE -.lastcounteropp: db ENEMY_COUNTER_MOVE, PLAYER_COUNTER_MOVE -.lastmove: db PLAYER_LAST_MOVE, ENEMY_LAST_MOVE -.lastmoveopp: db ENEMY_LAST_MOVE, PLAYER_LAST_MOVE +.Substatus1: db PLAYER_SUBSTATUS_1, ENEMY_SUBSTATUS_1 +.Substatus1Opp: db ENEMY_SUBSTATUS_1, PLAYER_SUBSTATUS_1 +.Substatus2: db PLAYER_SUBSTATUS_2, ENEMY_SUBSTATUS_2 +.Substatus2Opp: db ENEMY_SUBSTATUS_2, PLAYER_SUBSTATUS_2 +.Substatus3: db PLAYER_SUBSTATUS_3, ENEMY_SUBSTATUS_3 +.Substatus3Opp: db ENEMY_SUBSTATUS_3, PLAYER_SUBSTATUS_3 +.Substatus4: db PLAYER_SUBSTATUS_4, ENEMY_SUBSTATUS_4 +.Substatus4Opp: db ENEMY_SUBSTATUS_4, PLAYER_SUBSTATUS_4 +.Substatus5: db PLAYER_SUBSTATUS_5, ENEMY_SUBSTATUS_5 +.Substatus5Opp: db ENEMY_SUBSTATUS_5, PLAYER_SUBSTATUS_5 +.Status: db PLAYER_STATUS, ENEMY_STATUS +.StatusOpp: db ENEMY_STATUS, PLAYER_STATUS +.MoveAnim: db PLAYER_MOVE_ANIMATION, ENEMY_MOVE_ANIMATION +.MoveEffect: db PLAYER_MOVE_EFFECT, ENEMY_MOVE_EFFECT +.MovePower: db PLAYER_MOVE_POWER, ENEMY_MOVE_POWER +.MoveType: db PLAYER_MOVE_TYPE, ENEMY_MOVE_TYPE +.CurMove: db PLAYER_CUR_MOVE, ENEMY_CUR_MOVE +.LastCounter: db PLAYER_COUNTER_MOVE, ENEMY_COUNTER_MOVE +.LastCounterOpp: db ENEMY_COUNTER_MOVE, PLAYER_COUNTER_MOVE +.LastMove: db PLAYER_LAST_MOVE, ENEMY_LAST_MOVE +.LastMoveOpp: db ENEMY_LAST_MOVE, PLAYER_LAST_MOVE BattleVarLocations: ; entries correspond to PLAYER_* and ENEMY_* constants - dw PlayerSubStatus1, EnemySubStatus1 - dw PlayerSubStatus2, EnemySubStatus2 - dw PlayerSubStatus3, EnemySubStatus3 - dw PlayerSubStatus4, EnemySubStatus4 - dw PlayerSubStatus5, EnemySubStatus5 - dw BattleMonStatus, EnemyMonStatus + dw wPlayerSubStatus1, wEnemySubStatus1 + dw wPlayerSubStatus2, wEnemySubStatus2 + dw wPlayerSubStatus3, wEnemySubStatus3 + dw wPlayerSubStatus4, wEnemySubStatus4 + dw wPlayerSubStatus5, wEnemySubStatus5 + dw wBattleMonStatus, wEnemyMonStatus dw wPlayerMoveStructAnimation, wEnemyMoveStructAnimation dw wPlayerMoveStructEffect, wEnemyMoveStructEffect dw wPlayerMoveStructPower, wEnemyMoveStructPower dw wPlayerMoveStructType, wEnemyMoveStructType - dw CurPlayerMove, CurEnemyMove - dw LastPlayerCounterMove, LastEnemyCounterMove - dw LastPlayerMove, LastEnemyMove + dw wCurPlayerMove, wCurEnemyMove + dw wLastPlayerCounterMove, wLastEnemyCounterMove + dw wLastPlayerMove, wLastEnemyMove ; 3a90 |