diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/global.h | 2 | ||||
| -rw-r--r-- | include/constants/party_menu.h | 8 | ||||
| -rw-r--r-- | include/fldeff.h | 2 | ||||
| -rw-r--r-- | include/graphics.h | 3 | ||||
| -rw-r--r-- | include/item_use.h | 1 | ||||
| -rw-r--r-- | include/menu_helpers.h | 7 | ||||
| -rw-r--r-- | include/new_menu_helpers.h | 2 | ||||
| -rw-r--r-- | include/party_menu.h | 8 | ||||
| -rw-r--r-- | include/pokemon_jump.h | 1 | ||||
| -rw-r--r-- | include/strings.h | 9 |
10 files changed, 34 insertions, 9 deletions
diff --git a/include/constants/global.h b/include/constants/global.h index d7508c940..68c4f8246 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -80,4 +80,6 @@ enum #define NUM_BAG_POCKETS 5 +#define MULTI_PARTY_SIZE PARTY_SIZE / 2 + #endif //GUARD_CONSTANTS_GLOBAL_H diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h index f8f77f466..5c084ee6e 100644 --- a/include/constants/party_menu.h +++ b/include/constants/party_menu.h @@ -25,7 +25,11 @@ #define TUTOR_MOVE_EXPLOSION 12 #define TUTOR_MOVE_ROCK_SLIDE 13 #define TUTOR_MOVE_SUBSTITUTE 14 -#define TUTOR_MOVE_COUNT 15 +#define TUTOR_MOVE_COUNT 15 // regular tutor move count + +#define TUTOR_MOVE_FRENZY_PLANT 15 +#define TUTOR_MOVE_BLAST_BURN 16 +#define TUTOR_MOVE_HYDRO_CANNON 17 #define PARTY_LAYOUT_SINGLE 0 #define PARTY_LAYOUT_DOUBLE 1 @@ -54,7 +58,7 @@ #define PARTY_ACTION_USE_ITEM 3 #define PARTY_ACTION_ABILITY_PREVENTS 4 #define PARTY_ACTION_GIVE_ITEM 5 -#define PARTY_ACTION_GIVE_PC_ITEM 6 // Unused. Not possible to give non-mail items directly from PC +#define PARTY_ACTION_GIVE_PC_ITEM 6 // TODO: rename this one if necessary. Used for quest log. #define PARTY_ACTION_GIVE_MAILBOX_MAIL 7 #define PARTY_ACTION_SWITCH 8 #define PARTY_ACTION_SWITCHING 9 diff --git a/include/fldeff.h b/include/fldeff.h index 8dcb42500..d44ce75a2 100644 --- a/include/fldeff.h +++ b/include/fldeff.h @@ -47,7 +47,7 @@ bool8 FldEff_UseTeleport(void); // softboiled bool8 SetUpFieldMove_SoftBoiled(void); void ChooseMonForSoftboiled(u8 taskId); -void sub_80E5724(u8 taskId); +void Task_TryUseSoftboiledOnPartyMon(u8 taskId); // sweetscent bool8 SetUpFieldMove_SweetScent(void); diff --git a/include/graphics.h b/include/graphics.h index 930201403..e04f7b564 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3746,6 +3746,9 @@ extern const u32 gPartyMenuPokeball_Pal[]; extern const u32 gPartyMenuPokeballSmall_Gfx[]; extern const u32 gStatusGfx_Icons[]; extern const u32 gStatusPal_Icons[]; +extern const u32 gPartyMenuBg_Gfx[]; +extern const u32 gPartyMenuBg_Tilemap[]; +extern const u32 gPartyMenuBg_Pal[]; // credits extern const u32 gCreditsPokeballBgGfxTiles[]; diff --git a/include/item_use.h b/include/item_use.h index db98533f1..7e9f7a61d 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -40,5 +40,6 @@ void ItemUseInBattle_EnigmaBerry(u8 taskId); void ItemUseOutOfBattle_Itemfinder(u8 taskId); void sub_80A1C44(u8 taskId); u8 CanUseEscapeRopeOnCurrMap(void); +u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId); #endif //GUARD_ITEM_USE_H diff --git a/include/menu_helpers.h b/include/menu_helpers.h index 8d042825c..1e75b336c 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -5,6 +5,9 @@ #include "task.h" #include "window.h" +#define MENU_L_PRESSED 1 +#define MENU_R_PRESSED 2 + struct YesNoFuncTable { TaskFunc yesFunc; @@ -22,9 +25,9 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1); void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 paletteNum, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc); void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 fontId, u8 left, u8 top, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo); u8 GetLRKeysState(void); -u8 sub_80BF66C(void); +u8 GetLRKeysPressedAndHeld(void); bool8 itemid_link_can_give_berry(u16 itemId); bool8 itemid_80BF6D8_mail_related(u16 itemId); -void ClearVramOamPltt(void); +void ResetVramOamAndBgCntRegs(void); #endif //GUARD_MENU_HELPERS_H diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 644e65289..fdc835625 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -15,7 +15,7 @@ void *DecompressAndCopyTileDataToVram2(u8 bgId, const void *src, u32 size, u16 o void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void * MallocAndDecompress(const void * src, u32 * size); -void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); +void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void CopyRectIntoAltRect(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height); void ResetBgPositions(void); void InitStandardTextBoxWindows(void); diff --git a/include/party_menu.h b/include/party_menu.h index f5b4bd827..d3eb0181f 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -11,6 +11,7 @@ struct PartyMenu TaskFunc task; u8 menuType:4; u8 layout:2; + u8 unk_8_6:2; s8 slotId; s8 slotId2; u8 action; @@ -39,11 +40,11 @@ void CB2_GiveHoldItem(void); u8 GetCursorSelectionMonId(void); void ChooseMonForDaycare(void); void AnimatePartySlot(u8 monId, u8 a1); -void DisplayPartyMenuStdMessage(u8); +void DisplayPartyMenuStdMessage(u32); void Task_HandleChooseMonInput(u8 taskId); void PartyMenuModifyHP(u8 taskId, u8 a1, s8 a2, s16 amount, TaskFunc followupFunc); -void GetMonNickname(const struct Pokemon * mon, u8 * dest); -void DisplayPartyMenuMessage(const u8 * src, u8 a1); +u8 *GetMonNickname(struct Pokemon *mon, u8 *dest); +u8 DisplayPartyMenuMessage(const u8 * src, u8 a1); bool8 IsPartyMenuTextPrinterActive(void); void InitPartyMenu(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback); void sub_81252D0(u8 taskId, TaskFunc followUpFunc); @@ -69,5 +70,6 @@ void ShowPartyMenuToShowcaseMultiBattleParty(void); void SwitchPartyMonSlots(u8 slot, u8 slot2); void LoadHeldItemIcons(void); void OpenPartyMenuInTutorialBattle(u8 partyAction); +void ClearSelectedPartyOrder(void); #endif // GUARD_PARTY_MENU_H diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h index 62d0e610f..8623b223a 100644 --- a/include/pokemon_jump.h +++ b/include/pokemon_jump.h @@ -4,5 +4,6 @@ #include "main.h" void ResetPokeJumpResults(void); +bool32 IsSpeciesAllowedInPokemonJump(u16 species); #endif // GUARD_POKEMON_JUMP_H diff --git a/include/strings.h b/include/strings.h index 9242c7eaa..b60a5d568 100644 --- a/include/strings.h +++ b/include/strings.h @@ -335,6 +335,15 @@ extern const u8 gText_OtherTrainersPkmnCantBeTraded[]; extern const u8 gText_EggCantBeTradedNow[]; extern const u8 gText_OtherTrainerCantAcceptPkmn[]; extern const u8 gText_CantTradeWithTrainer[]; +extern const u8 gUnknown_84176CF[]; +extern const u8 gText_PkmnWasGivenItem[]; +extern const u8 gText_ReceivedItemFromPkmn[]; +extern const u8 gText_PkmnAlreadyHoldingItemSwitch[]; +extern const u8 gText_SwitchedPkmnItem[]; +extern const u8 gText_BagFullCouldNotRemoveItem[]; +extern const u8 gText_PkmnCantParticipate[]; +extern const u8 gText_CancelParticipation[]; +extern const u8 gUnknown_8417494[]; // credits extern const u8 gString_Dummy[]; |