Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-07 10:36:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2239 from DizzyEggg/quash

Browse Source 
Quash
This commit is contained in:
ghoulslash
2022-08-29 10:43:54 -04:00
committed by GitHub
parent 280fd4b50b 2d4ac679a6
commit 2cd01bd95d
4 changed files with 68 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/battle.h
View File

@@ -147,6 +147,7 @@ struct ProtectStruct
u16 pranksterElevated:1;
u16 quickDraw:1;
u16 beakBlastCharge:1;
u16 quash:1;
u32 physicalDmg;
u32 specialDmg;
u8 physicalBattlerId;
@@ -670,7 +671,7 @@ struct BattleStruct
#define SET_STATCHANGER(statId, stage, goesDown)(gBattleScripting.statChanger = (statId) + ((stage) << 3) + (goesDown << 7))
#define SET_STATCHANGER2(dst, statId, stage, goesDown)(dst = (statId) + ((stage) << 3) + (goesDown << 7))
// NOTE: The members of this struct have hard-coded offsets
// NOTE: The members of this struct have hard-coded offsets
// in include/constants/battle_script_commands.h
struct BattleScripting
{