diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-17 17:14:32 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-17 17:14:32 +0200 |
| commit | 75595f9b3dfc57707183dae5d842ba21a8c2ff7f (patch) | |
| tree | dfc69e0a40b91f355cd1166dd28ad388df9328d2 /include | |
| parent | c7592bc87c4b0f7007817784025046c304ca43c5 (diff) | |
decompile battle 3
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h index c31aff6e8..4093f55d1 100644 --- a/include/battle.h +++ b/include/battle.h @@ -399,12 +399,18 @@ struct BattleScriptsStack u8 size; }; +struct BattleCallbacksStack +{ + void (*function[8])(void); + u8 size; +}; + struct BattleResources { struct SecretBaseRecord* secretBase; struct UnknownFlags *flags; struct BattleScriptsStack* battleScriptsStack; - void* battleCallbackStack; + struct BattleCallbacksStack* battleCallbackStack; void* statsBeforeLvlUp; struct AI_ThinkingStruct *ai; struct BattleHistory *battleHistory; @@ -413,7 +419,8 @@ struct BattleResources extern struct BattleResources* gBattleResources; -#define BATTLESCRIPTS_STACK (gBattleResources->battleScriptsStack) +#define BATTLESCRIPTS_STACK (gBattleResources->battleScriptsStack) +#define BATTLE_CALLBACKS_STACK (gBattleResources->battleCallbackStack) struct BattleResults { @@ -506,7 +513,7 @@ struct BattleStruct u8 field_47; u8 field_48; u8 field_49; - u8 field_4A; + u8 moneyMultiplier; u8 field_4B; u8 field_4C; u8 field_4D; @@ -622,6 +629,13 @@ 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; \ +} + struct BattleScripting { u8 field_0; @@ -645,6 +659,9 @@ struct BattleScripting u8 field_15; u8 field_16; u8 bank; + u8 field_18; + u8 field_19; + u8 statChanger; }; extern struct BattleScripting gBattleScripting; |