diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:13:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 11:13:58 -0500 |
| commit | 1d006c26616889c7f53ba418c34d0cb151d5ba86 (patch) | |
| tree | c5a81e833e822125212ae676fbd0cfae4bd1daae /src/pokemon.c | |
| parent | 4ab216f309fe2db2cd2abfa775fa235f59178791 (diff) | |
| parent | 04130a97d9ff799c9f1b439d091c0116adb31bfb (diff) | |
Merge branch 'master' into doc-tilesets
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 09e2ed998..f1f7834b1 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -90,7 +90,20 @@ static u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon); #include "data/battle_moves.h" -static const u8 sUnreferencedData[] = { 0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 }; +// Used in an unreferenced function in RS. +// Unreferenced here and in Emerald. +struct CombinedMove +{ + u16 move1; + u16 move2; + u16 newMove; +}; + +static const struct CombinedMove sCombinedMoves[2] = +{ + {MOVE_EMBER, MOVE_GUST, MOVE_HEAT_WAVE}, + {0xFFFF, 0xFFFF, 0xFFFF} +}; static const u16 sSpeciesToHoennPokedexNum[] = // Assigns all species to the Hoenn Dex Index (Summary No. for Hoenn Dex) { |