diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-11-03 09:28:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-03 09:28:45 -0500 |
| commit | 99dd461befcfe3bef3ce188fea2fb372c2f21b98 (patch) | |
| tree | 2b0198d394186c371987f018677d12f929a66a44 /include/battle.h | |
| parent | 9e55ae22b19d58eca8fc0cdd2fcea9f2cca14319 (diff) | |
| parent | ca950a8daf6dd95ab5dacc51f250fea7b605361c (diff) | |
Merge pull request #1189 from aaaaaa123456789/reverts
Undo PokeCodec's PRs and port changes
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h index e4b773089..8dad6bc25 100644 --- a/include/battle.h +++ b/include/battle.h @@ -124,8 +124,8 @@ struct ProtectStruct u32 flinchImmobility:1; u32 notFirstStrike:1; u32 palaceUnableToUseMove:1; - s32 physicalDmg; - s32 specialDmg; + u32 physicalDmg; + u32 specialDmg; u8 physicalBattlerId; u8 specialBattlerId; }; @@ -254,7 +254,7 @@ struct BattleResults u16 playerMon2Species; // 0x26 u16 caughtMonSpecies; // 0x28 u8 caughtMonNick[POKEMON_NAME_LENGTH + 1]; // 0x2A - u8 filler35; // 0x35 + u8 filler35; // 0x35 u8 catchAttempts[11]; // 0x36 }; |