diff options
| author | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-10-26 12:16:36 -0300 |
|---|---|---|
| committer | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-10-26 12:16:36 -0300 |
| commit | 1c3d75f6736445324fdcba31d5dbd858997e22c4 (patch) | |
| tree | e0a94bdb8c2a3323048c9dc9540fa6b5af004c83 /include/battle.h | |
| parent | fe40c0c4663d732c8ba9ca5f5e00b3c14a17d304 (diff) | |
| parent | 585f313c646cb9494bed48395572daf1502978a5 (diff) | |
Merge branch 'master' into reverts
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 5284040f1..8dad6bc25 100644 --- a/include/battle.h +++ b/include/battle.h @@ -493,7 +493,7 @@ struct BattleScripting u8 field_20; u8 reshowMainState; u8 reshowHelperState; - u8 field_23; + u8 levelUpHP; u8 windowsType; // 0 - normal, 1 - battle arena u8 multiplayerId; u8 specialTrainerBattleType; |