diff options
| author | scnorton <scnorton@biociphers.org> | 2019-01-06 16:00:27 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2019-01-06 16:00:27 -0500 |
| commit | fdd7b1033cb32f02eb861ca87fa92b9886bdfe37 (patch) | |
| tree | 9ac899b61e39aa12abbcdb5ae406337c458c25fb /include | |
| parent | 2822d29c0bd7e579388f9d0772a7b5d1af430b31 (diff) | |
Through ScrCmd_pokemart
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_setup.h | 4 | ||||
| -rw-r--r-- | include/party_menu.h | 2 | ||||
| -rw-r--r-- | include/pokemon_storage_system.h | 1 | ||||
| -rw-r--r-- | include/quest_log.h | 1 | ||||
| -rw-r--r-- | include/script_menu.h | 1 | ||||
| -rw-r--r-- | include/script_pokemon_util_80A0058.h | 8 |
6 files changed, 14 insertions, 3 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index 86a84f471..61395811b 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -11,8 +11,8 @@ void BattleSetup_StartWildBattle(void); void BattleSetup_StartRoamerBattle(void); u8 HasTrainerAlreadyBeenFought(u16); -void trainer_flag_set(u16); -void trainer_flag_clear(u16); +void SetTrainerFlag(u16); +void ClearTrainerFlag(u16); void BattleSetup_StartTrainerBattle(void); u8 *BattleSetup_GetScriptAddrAfterBattle(void); u8 *BattleSetup_GetTrainerPostBattleScript(void); diff --git a/include/party_menu.h b/include/party_menu.h index 19e1f7d4e..2e83c1496 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -12,7 +12,7 @@ enum { AILMENT_BRN }; -bool8 pokemon_has_move(struct Pokemon *, u16); +bool8 MonKnowsMove(struct Pokemon *, u16); void sub_81B58A8(void); void DoWallyTutorialBagMenu(void); u8 pokemon_ailments_get_primary(u32 status); diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 5b2d2052b..897c5a42e 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -12,5 +12,6 @@ void SetBoxMonNickFromAnyBox(u8 boxId, u8 monPosition, u8 * newNick); void CompactPartySlots(void); u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request); void sub_808BCB4(u8 boxId, u8 monPosition); +u8 * GetBoxNamePtr(u8 boxId); #endif // GUARD_POKEMON_STORAGE_SYSTEM_H diff --git a/include/quest_log.h b/include/quest_log.h index faa47a809..31220b86c 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -23,6 +23,7 @@ void sub_8112720(u8); void sub_8113550(u16, const u16 *); void sub_8115748(u16); u8 sub_8112CAC(void); +bool8 sub_81119D4(void (*func)(void)); extern u8 gUnknown_203ADFA; diff --git a/include/script_menu.h b/include/script_menu.h index 01402d565..f82b061a5 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -11,5 +11,6 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2); bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount); bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); +void sub_809D6D4(void); #endif //GUARD_SCRIPT_MENU_H diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util_80A0058.h new file mode 100644 index 000000000..e1d228589 --- /dev/null +++ b/include/script_pokemon_util_80A0058.h @@ -0,0 +1,8 @@ +#ifndef GUARD_SCRIPT_POKEMON_UTIL_80A0058_H +#define GUARD_SCRIPT_POKEMON_UTIL_80A0058_H + +bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3); +bool8 ScriptGiveEgg(u16 species); +void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot); + +#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H |