diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 05:57:13 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 05:57:26 +0800 |
| commit | 631eccb92ddbbac3630ebbcad84c3557450577a2 (patch) | |
| tree | 6d612c84bc23695783d0e55d1e28c51e6d13f4f4 /include | |
| parent | b4692071218344995fed976ea1023df4702caa9e (diff) | |
thru OakOldManHandleSwitchInAnim
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 4 | ||||
| -rw-r--r-- | include/battle_anim.h | 2 | ||||
| -rw-r--r-- | include/item.h | 1 | ||||
| -rw-r--r-- | include/item_menu.h | 1 | ||||
| -rw-r--r-- | include/strings.h | 11 |
5 files changed, 17 insertions, 2 deletions
diff --git a/include/battle.h b/include/battle.h index 4c28c24a0..9545bacff 100644 --- a/include/battle.h +++ b/include/battle.h @@ -510,7 +510,9 @@ struct BattleStruct u8 expGetterBattlerId; u8 field_90; u8 field_91; - u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT]; + u8 AI_monToSwitchIntoId[2]; + u8 field_94; + u8 field_95; u8 field_96; u8 field_97; u8 lastTakenMove[MAX_BATTLERS_COUNT * 2 * 2]; // ask gamefreak why they declared it that way diff --git a/include/battle_anim.h b/include/battle_anim.h index 1eb1a7353..9db123f91 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -167,6 +167,8 @@ void LaunchStatusAnimation(u8 bank, u8 statusAnimId); u8 ItemIdToBallId(u16 itemId); u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId); u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); +void sub_80EEFC8(u8 *, u8 *, u8 battlerId); +void sub_80EF0E0(u8 batterId); // battle_anim_mons.c extern const struct MonCoords gCastformFrontSpriteCoords[]; diff --git a/include/item.h b/include/item.h index 69560a0e5..dd6271d13 100644 --- a/include/item.h +++ b/include/item.h @@ -37,7 +37,6 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity); bool8 IsBagPocketNonEmpty(u8 pocket); bool8 CheckBagHasItem(u16 itemId, u16 count); bool8 CheckBagHasSpace(u16 itemId, u16 count); -bool8 AddBagItem(u16 itemId, u16 count); bool8 RemoveBagItem(u16 itemId, u16 count); u8 GetPocketByItemId(u16 itemId); void ClearItemSlots(struct ItemSlot *itemSlots, u8 b); diff --git a/include/item_menu.h b/include/item_menu.h index 166906ebe..d12b9f394 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -36,6 +36,7 @@ void ItemMenu_SetExitCallback(void (*)(void)); void DisplayItemMessageInBag(u8 taskId, u8 bgId, const u8 * string, TaskFunc followUpFunc); void sub_810A1F8(u8 taskId); void sub_8107ECC(void); +void sub_810AF74(void); void sub_8108DC8(u8 pocketId); void sub_81089F4(u8 pocketId); void sub_8107DB4(u8 menuType, u8 pocket, MainCallback callback); diff --git a/include/strings.h b/include/strings.h index 8f3da98cf..4b96a95a9 100644 --- a/include/strings.h +++ b/include/strings.h @@ -227,6 +227,17 @@ extern const u8 gText_WhatWillPkmnDo[]; // battle_script_commands extern const u8 gText_BattleYesNoChoice[]; +// battle_controller_oak_old_man +extern const u8 gUnknown_83FDAE2[]; +extern const u8 gUnknown_83FDB92[]; +extern const u8 gUnknown_83FDBEF[]; +extern const u8 gUnknown_83FDC58[]; +extern const u8 gUnknown_83FDC95[]; +extern const u8 gUnknown_83FDD23[]; +extern const u8 gUnknown_83FDD64[]; +extern const u8 gUnknown_83FDDEB[]; +extern const u8 gUnknown_83FDCD2[]; + // credits extern const u8 gString_Dummy[]; extern const u8 gString_PokemonFireRed_Staff[]; // FR |