diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 13:26:58 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 13:26:58 +0100 |
| commit | 9886eeb5d8b0a19e31537fbc3e1245f20577d513 (patch) | |
| tree | 2159af378a65ef3972554274366f1d070cdebbaf /include/battle.h | |
| parent | cc572f7c00b7a07161b5298868bcb495b7c87b61 (diff) | |
fix, rename, label battle labels and battlescripts
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/battle.h b/include/battle.h index e65833b4f..c172cb0f6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -706,13 +706,6 @@ struct BattleStruct extern struct BattleStruct* gBattleStruct; -#define MEME_ACCESS_U8(structName, structPtr, arrayId, offsetField, value) \ -{ \ - u8* var2 = (u8*)((u32)(arrayId)); \ - var2 = (u32)(structPtr) + var2; \ - var2[offsetof(struct structName, offsetField)] = value; \ -} - #define GET_MOVE_TYPE(move, typeArg) \ { \ if (gBattleStruct->dynamicMoveType) \ @@ -850,8 +843,7 @@ struct BattleScripting u8 twoTurnsMoveStringId; u8 animArg1; u8 animArg2; - u8 tripleKickPower; - u8 field_13; + u16 tripleKickPower; u8 atk49_state; u8 field_15; u8 field_16; |