diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:14:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:19:52 -0500 |
| commit | 6b2d0ae841f5a7ff851d462b12f09eac998d2d8f (patch) | |
| tree | 280e64b26f9b525606de02701f0c9a768301c4d2 /battle/effect_command_pointers.asm | |
| parent | 010b450834bd595b961582aea5e5771632510ef9 (diff) | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
Fix merge conflicts
Diffstat (limited to 'battle/effect_command_pointers.asm')
| -rw-r--r-- | battle/effect_command_pointers.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm index 8248955a8..23beebc16 100644 --- a/battle/effect_command_pointers.asm +++ b/battle/effect_command_pointers.asm @@ -8,7 +8,7 @@ BattleCommandPointers: ; 3fd28 dw BattleCommand04 ; 34555 dw BattleCommand05 ; 34631 dw BattleCommand06 ; 352dc - dw BattleCommand07 ; 346d2 + dw BattleCommand_CalcDamageTypeMultiplier ; 346d2 - 07 dw BattleCommand08 ; 34cfd dw BattleCommand09 ; 34d32 dw BattleCommand0a ; 34eee @@ -99,7 +99,7 @@ BattleCommandPointers: ; 3fd28 dw BattleCommand5f ; 377ce dw BattleCommand60 ; 3784b dw BattleCommand61 ; 37874 - dw BattleCommand62 ; 35612 + dw BattleCommand_DamageCalcWithStats ; 35612 - 62 dw BattleCommand63 ; 3790e dw BattleCommand64 ; 37939 dw BattleCommand65 ; 37972 @@ -148,7 +148,7 @@ BattleCommandPointers: ; 3fd28 dw BattleCommand90 ; 34ecc dw BattleCommand91 ; 34fdb dw BattleCommand92 ; 34fd1 - dw BattleCommand93 ; 34ffd + dw BattleCommand_SwitchTurn ; 34ffd - 93 dw BattleCommand94 ; 36a82 dw BattleCommand95 ; 37c1a dw BattleCommand96 ; 37c55 @@ -170,7 +170,7 @@ BattleCommandPointers: ; 3fd28 dw BattleCommanda6 ; 365af dw BattleCommanda7 ; 365c3 dw BattleCommanda8 ; 355b5 - dw BattleCommanda9 ; 355d5 + dw BattleCommand_IfAttackMissedResetDamage ; 355d5 - a9 dw BattleCommandaa ; 37e80 dw BattleCommandab ; 34f57 dw BattleCommandac ; 3658f |