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 | |
| parent | cc572f7c00b7a07161b5298868bcb495b7c87b61 (diff) | |
fix, rename, label battle labels and battlescripts
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 10 | ||||
| -rw-r--r-- | include/battle_scripts.h | 18 |
2 files changed, 10 insertions, 18 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; diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 3c6d63e88..053942b9f 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -13,9 +13,9 @@ extern const u8 BattleScript_PrintMoveMissed[]; extern const u8 BattleScript_MoveMissedPause[]; extern const u8 BattleScript_MoveMissed[]; extern const u8 BattleScript_EffectSleep[]; -extern const u8 BattleScript_82D8AB0[]; -extern const u8 BattleScript_82D8AC1[]; -extern const u8 BattleScript_82D8ACF[]; +extern const u8 BattleScript_AlreadyAsleep[]; +extern const u8 BattleScript_WasntAffected[]; +extern const u8 BattleScript_CantMakeAsleep[]; extern const u8 BattleScript_EffectPoisonHit[]; extern const u8 BattleScript_EffectAbsorb[]; extern const u8 BattleScript_82D8B26[]; @@ -94,7 +94,7 @@ extern const u8 BattleScript_EffectMist[]; extern const u8 BattleScript_EffectFocusEnergy[]; extern const u8 BattleScript_EffectRecoil[]; extern const u8 BattleScript_EffectConfuse[]; -extern const u8 BattleScript_82D9201[]; +extern const u8 BattleScript_AlreadyConfused[]; extern const u8 BattleScript_EffectAttackUp2[]; extern const u8 BattleScript_EffectDefenseUp2[]; extern const u8 BattleScript_EffectSpeedUp2[]; @@ -109,7 +109,7 @@ extern const u8 BattleScript_EffectReflect[]; extern const u8 BattleScript_82D928C[]; extern const u8 BattleScript_EffectPoison[]; extern const u8 BattleScript_EffectParalyze[]; -extern const u8 BattleScript_82D9351[]; +extern const u8 BattleScript_AlreadyParalyzed[]; extern const u8 BattleScript_LimberProtected[]; extern const u8 BattleScript_EffectAttackDownHit[]; extern const u8 BattleScript_EffectDefenseDownHit[]; @@ -155,11 +155,11 @@ extern const u8 BattleScript_EffectHealBell[]; extern const u8 BattleScript_82D96ED[]; extern const u8 BattleScript_82D96FE[]; extern const u8 BattleScript_EffectTripleKick[]; -extern const u8 BattleScript_82D9718[]; +extern const u8 BattleScript_TripleKickLoop[]; extern const u8 BattleScript_82D973A[]; -extern const u8 BattleScript_82D9799[]; -extern const u8 BattleScript_82D97AD[]; -extern const u8 BattleScript_82D97D7[]; +extern const u8 BattleScript_TripleKickNoMoreHits[]; +extern const u8 BattleScript_TripleKickPrintStrings[]; +extern const u8 BattleScript_TripleKickEnd[]; extern const u8 BattleScript_EffectThief[]; extern const u8 BattleScript_EffectMeanLook[]; extern const u8 BattleScript_EffectNightmare[]; |