diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2021-03-08 07:01:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-08 07:01:31 -0800 |
| commit | e791c5392b19f589c51afd98666d19e778278847 (patch) | |
| tree | 4392cbecdd5166484f3a8ec8799939434159bae3 /home/battle_vars.asm | |
| parent | fb35fe6aba5e4e4ce7edf5b345fdf2afec4b6b49 (diff) | |
| parent | 98da09b3e90b6a132ce6d2431999485593aef0c9 (diff) | |
Merge pull request #806 from Rangi42/tables
Verify data table sizes with table_width and assert_table_length macros
Diffstat (limited to 'home/battle_vars.asm')
| -rw-r--r-- | home/battle_vars.asm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/home/battle_vars.asm b/home/battle_vars.asm index 2ed86484d..70567ce74 100644 --- a/home/battle_vars.asm +++ b/home/battle_vars.asm @@ -49,6 +49,7 @@ GetBattleVarAddr:: BattleVarPairs: ; entries correspond to BATTLE_VARS_* constants + table_width 2, BattleVarPairs dw .Substatus1 dw .Substatus2 dw .Substatus3 @@ -70,6 +71,7 @@ BattleVarPairs: dw .LastCounterOpp dw .LastMove dw .LastMoveOpp + assert_table_length NUM_BATTLE_VARS ; player enemy .Substatus1: db PLAYER_SUBSTATUS_1, ENEMY_SUBSTATUS_1 @@ -96,6 +98,7 @@ BattleVarPairs: BattleVarLocations: ; entries correspond to PLAYER_* and ENEMY_* constants + table_width 2 + 2, BattleVarLocations dw wPlayerSubStatus1, wEnemySubStatus1 dw wPlayerSubStatus2, wEnemySubStatus2 dw wPlayerSubStatus3, wEnemySubStatus3 @@ -109,3 +112,4 @@ BattleVarLocations: dw wCurPlayerMove, wCurEnemyMove dw wLastPlayerCounterMove, wLastEnemyCounterMove dw wLastPlayerMove, wLastEnemyMove + assert_table_length NUM_BATTLE_VAR_LOCATION_PAIRS |