diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-25 21:11:20 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-25 21:11:20 +0100 |
| commit | fe658cc2fd673db774ca533f8bafde7210774c42 (patch) | |
| tree | 1ae5e294011b5692a6c1224100d8e648b7d13a27 | |
| parent | 9151a6d0942c5211f648154bbc675ce4d3a495a7 (diff) | |
create setword macro
| -rw-r--r-- | asm/macros/battle_script.inc | 7 | ||||
| -rw-r--r-- | data/battle_scripts_1.s | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 3a8e99a94..0bbd1dc0b 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1230,3 +1230,10 @@ .macro chosenstatus2animation bank, status chosenstatusanimation \bank 0x1 \status .endm + + .macro setword dst, value + setbyte \dst, \value & 0xFF + setbyte \dst + 1, (\value >> 8) & 0xFF + setbyte \dst + 2, (\value >> 16) & 0xFF + setbyte \dst + 3, (\value >> 24) & 0xFF + .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 1f6be1390..7d1c4f8ec 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -826,10 +826,7 @@ BattleScript_EffectDragonRage:: ppreduce typecalc bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE - setbyte gBattleMoveDamage, 0x28 - setbyte gBattleMoveDamage + 1, 0x0 - setbyte gBattleMoveDamage + 2, 0x0 - setbyte gBattleMoveDamage + 3, 0x0 + setword gBattleMoveDamage, 40 adjustsetdamage goto BattleScript_HitFromAtkAnimation @@ -1740,10 +1737,7 @@ BattleScript_EffectSonicboom:: ppreduce typecalc bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE - setbyte gBattleMoveDamage, 0x14 - setbyte gBattleMoveDamage + 1, 0x0 - setbyte gBattleMoveDamage + 2, 0x0 - setbyte gBattleMoveDamage + 3, 0x0 + setword gBattleMoveDamage, 20 adjustsetdamage goto BattleScript_HitFromAtkAnimation |