diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-23 10:45:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 10:45:19 -0600 |
| commit | e874267edb6617759e239da0fb5cb884867aec6d (patch) | |
| tree | c196c373809a9d60077a890c6ac77ff0515bcf75 /include/battle_main.h | |
| parent | f1ee374e93d0727074e2c760924b5a89b78aa2b9 (diff) | |
| parent | efa820469afcd92b0fdd6b7fff589143ea63c45c (diff) | |
Merge pull request #469 from DizzyEggg/data
Move some data to C
Diffstat (limited to 'include/battle_main.h')
| -rw-r--r-- | include/battle_main.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/battle_main.h b/include/battle_main.h index 18bdde2f1..c134f819f 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -54,7 +54,7 @@ void sub_8038B74(struct Sprite *sprite); void sub_8038D64(void); u32 sub_80391E0(u8 arrayId, u8 caseId); u32 sub_80397C4(u32 setId, u32 tableId); -void oac_poke_opponent(struct Sprite *sprite); +void SpriteCb_WildMon(struct Sprite *sprite); void SpriteCallbackDummy_2(struct Sprite *sprite); void SpriteCB_FaintOpponentMon(struct Sprite *sprite); void sub_8039AD8(struct Sprite *sprite); @@ -86,6 +86,9 @@ bool8 TryRunFromBattle(u8 battlerId); extern struct UnknownPokemonStruct4 gUnknown_02022FF8[3]; +extern const struct SpriteTemplate gUnknown_0831AC88; +extern const struct OamData gOamData_831ACA8; +extern const struct OamData gOamData_831ACB0; extern const u8 gTypeEffectiveness[336]; extern const u8 gTypeNames[][TYPE_NAME_LENGTH + 1]; extern const struct TrainerMoney gTrainerMoneyTable[]; |