From d3d725cc8398f306eb489dd0e6aa16b7e7564f39 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Thu, 11 Oct 2018 21:23:39 -0400 Subject: decompiled up to sub_81B0948 --- include/battle_main.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'include/battle_main.h') diff --git a/include/battle_main.h b/include/battle_main.h index 5a61b5ef0..18bdde2f1 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -7,6 +7,20 @@ struct TrainerMoney u8 value; }; +struct UnknownPokemonStruct4 +{ + /*0x00*/ u16 species; + /*0x02*/ u16 heldItem; + /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; + /*0x0F*/ u8 level; + /*0x10*/ u16 hp; + /*0x12*/ u16 maxhp; + /*0x14*/ u32 status; + /*0x18*/ u32 personality; + /*0x1C*/ u8 gender; + /*0x1D*/ u8 language; +}; + #define TYPE_NAME_LENGTH 6 #define ABILITY_NAME_LENGTH 12 @@ -70,6 +84,8 @@ void RunBattleScriptCommands_PopCallbacksStack(void); void RunBattleScriptCommands(void); bool8 TryRunFromBattle(u8 battlerId); +extern struct UnknownPokemonStruct4 gUnknown_02022FF8[3]; + extern const u8 gTypeEffectiveness[336]; extern const u8 gTypeNames[][TYPE_NAME_LENGTH + 1]; extern const struct TrainerMoney gTrainerMoneyTable[]; -- cgit v1.2.3 From efa820469afcd92b0fdd6b7fff589143ea63c45c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 23 Dec 2018 14:52:47 +0100 Subject: move data to c --- include/battle_main.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/battle_main.h') 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[]; -- cgit v1.2.3