diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/battle_main.h | 16 | ||||
-rw-r--r-- | include/contest.h | 1 | ||||
-rwxr-xr-x | include/fldeff_softboiled.h | 6 | ||||
-rw-r--r-- | include/graphics.h | 5 | ||||
-rw-r--r-- | include/party_menu.h | 31 |
5 files changed, 46 insertions, 13 deletions
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[]; diff --git a/include/contest.h b/include/contest.h index d62d33ab7..f15a7310e 100644 --- a/include/contest.h +++ b/include/contest.h @@ -427,5 +427,6 @@ bool8 Contest_IsMonsTurnDisabled(u8 a); bool8 sub_80DE1E8(u8 a); void SetStartledString(u8 a, u8 b); s8 Contest_GetMoveExcitement(u16); +u8 sub_80DAE0C(struct Pokemon *); #endif //GUARD_CONTEST_H diff --git a/include/fldeff_softboiled.h b/include/fldeff_softboiled.h new file mode 100755 index 000000000..8579c6cfe --- /dev/null +++ b/include/fldeff_softboiled.h @@ -0,0 +1,6 @@ +#ifndef GUARD_FLDEFF_SOFTBOILED_H +#define GUARD_FLDEFF_SOFTBOILED_H + +void sub_81615A8(u8 taskId); + +#endif // GUARD_FLDEFF_SOFTBOILED_H diff --git a/include/graphics.h b/include/graphics.h index 4cbee1c34..a7bbc5b68 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3914,6 +3914,11 @@ extern const u16 gIntro2BrendanNoTurnPal[]; extern const u16 gIntro2FlygonPal[]; extern const u8 gIntro2FlygonGfx[]; +// party menu graphics +extern const u8 gPartyMenuMisc_Gfx[]; +extern const u16 gPartyMenuMisc_Tilemap[]; +extern const u8 gPartyMenuMisc_Pal[]; + // berry pics extern const u8 gBerryPic_Cheri[]; extern const u8 gBerryPalette_Cheri[]; diff --git a/include/party_menu.h b/include/party_menu.h index 170fcafc1..0103099e4 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -10,7 +10,8 @@ enum AILMENT_PRZ, AILMENT_SLP, AILMENT_FRZ, - AILMENT_BRN + AILMENT_BRN, + AILMENT_FNT = 7 }; enum @@ -23,13 +24,17 @@ enum PARTY_GIVE_ITEM, }; -struct Struct203CEC8 -{ - u8 filler[0x9]; +struct Struct203CEC8 { + MainCallback unk0; + TaskFunc unk4; + u8 unk8_0:4; + u8 unk8_1:2; + u8 unk8_2:2; s8 unk9; s8 unkA; u8 unkB; - u8 filler2[0x2]; + u8 unkD; + u8 unkE; }; extern struct Struct203CEC8 gUnknown_0203CEC8; @@ -47,7 +52,7 @@ void sub_81B7F60(void); void sub_81B0FCC(u8 partyIdx, u8 a); void sub_81B1370(u8 taskId); -void display_pokemon_menu_message(u8 windowId); +void display_pokemon_menu_message(u32 windowId); void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func); void sub_81B1B5C(void *a, u8 b); u8 sub_81B1BD4(void); @@ -62,14 +67,14 @@ void sub_81B617C(void); u8 sub_81B6D14(u16 a); bool8 hm_add_c3_without_phase_2(void); -extern void dp05_ether(u8, u16, TaskFunc); -extern void dp05_pp_up(u8, u16, TaskFunc); -extern void dp05_rare_candy(u8, u16, TaskFunc); +extern void dp05_ether(u8, TaskFunc); +extern void dp05_pp_up(u8, TaskFunc); +extern void dp05_rare_candy(u8, TaskFunc); -extern void sub_81B67C8(u8, u16, TaskFunc); -extern void sub_81B79E8(u8, u16, TaskFunc); -extern void sub_81B6DC4(u8, u16, TaskFunc); -extern void sub_81B7C74(u8, u16, TaskFunc); +extern void sub_81B67C8(u8, TaskFunc); +extern void sub_81B79E8(u8, TaskFunc); +extern void sub_81B6DC4(u8, TaskFunc); +extern void sub_81B7C74(u8, TaskFunc); extern u16 ItemIdToBattleMoveId(u16); #endif // GUARD_PARTY_MENU_H |