diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-02-01 12:04:51 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-02-01 12:07:40 -0500 |
| commit | 462acaa7dc343c0eb864bd9c451ed8a8690fcf33 (patch) | |
| tree | 49509bbe337af95624815bde66b4b8be58c53c01 /src | |
| parent | 9a6c2c25d08ef157cc4800014651bd0c679f6fc5 (diff) | |
sCombinedMoves
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 6dd09902d..040b342d2 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -73,7 +73,21 @@ EWRAM_DATA struct Unknown_806F160_Struct *gUnknown_020249B4[2] = {NULL}; // const rom data #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 FRLG. +struct CombinedMove +{ + u16 move1; + u16 move2; + u16 newMove; +}; + +static const struct CombinedMove sCombinedMoves[2] = +{ + {MOVE_EMBER, MOVE_GUST, MOVE_HEAT_WAVE}, + {0xFFFF, 0xFFFF, 0xFFFF} +}; #define SPECIES_TO_HOENN(name) [SPECIES_##name - 1] = HOENN_DEX_##name #define SPECIES_TO_NATIONAL(name) [SPECIES_##name - 1] = NATIONAL_DEX_##name |