diff options
Diffstat (limited to 'include')
| -rw-r--r--[-rwxr-xr-x] | include/battle.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/decoration.h | 0 | ||||
| -rw-r--r-- | include/item.h | 6 | ||||
| -rw-r--r-- | include/item_use.h | 25 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/menu.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/menu_helpers.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/pokeblock.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/pokemon.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/pokenav.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/region_map.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/strings.h | 0 | ||||
| -rw-r--r-- | include/text.h | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/vars.h | 0 |
13 files changed, 29 insertions, 4 deletions
diff --git a/include/battle.h b/include/battle.h index fb5077f6a..fb5077f6a 100755..100644 --- a/include/battle.h +++ b/include/battle.h diff --git a/include/decoration.h b/include/decoration.h index 7a6d8ef5a..7a6d8ef5a 100755..100644 --- a/include/decoration.h +++ b/include/decoration.h diff --git a/include/item.h b/include/item.h index 80a460caa..8f6cc883b 100644 --- a/include/item.h +++ b/include/item.h @@ -11,7 +11,7 @@ struct Item u16 price; u8 holdEffect; u8 holdEffectParam; - u8 *description; + const u8 *description; u8 importance; u8 unk19; u8 pocket; @@ -45,12 +45,12 @@ bool8 CheckPCHasItem(u16 itemId, u16 count); bool8 AddPCItem(u16 itemId, u16 count); void RemovePCItem(u8 index, u16 count); void SwapRegisteredBike(void); -struct Item *ItemId_GetItem(u16 itemId); +const struct Item *ItemId_GetItem(u16 itemId); u16 ItemId_GetId(u16 itemId); u16 ItemId_GetPrice(u16 itemId); u8 ItemId_GetHoldEffect(u16 itemId); u8 ItemId_GetHoldEffectParam(u16 itemId); -u8 *ItemId_GetDescription(u16 itemId); +const u8 *ItemId_GetDescription(u16 itemId); bool32 ItemId_CopyDescription(u8 *a, u32 itemId, u32 c); u8 ItemId_GetImportance(u16 itemId); u8 ItemId_GetUnknownValue(u16 itemId); diff --git a/include/item_use.h b/include/item_use.h index 61a3b4f7a..1558f7691 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -3,28 +3,51 @@ extern u16 gScriptItemId; +void ItemUseOutOfBattle_Mail(u8); +void ItemUseOutOfBattle_Bike(u8); void ItemUseOnFieldCB_Bike(u8); +void ItemUseOutOfBattle_Rod(u8); void ItemUseOnFieldCB_Rod(u8); +void ItemUseOutOfBattle_Itemfinder(u8); void ItemUseOnFieldCB_Itemfinder(u8); void RunItemfinderResults(u8); void ExitItemfinder(u8); -bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId); +bool8 ItemfinderCheckForHiddenItems(struct MapEvents *, u8); void sub_80C9720(u8); void sub_80C9838(u8, s16, s16); u8 GetPlayerDirectionTowardsHiddenItem(s16, s16); void SetPlayerDirectionTowardsItem(u8); void DisplayItemRespondingMessageAndExitItemfinder(u8); void RotatePlayerAndExitItemfinder(u8); +void ItemUseOutOfBattle_PokeblockCase(u8); +void ItemUseOutOfBattle_CoinCase(u8); +void ItemUseOutOfBattle_SSTicket(u8); void sub_80C9D00(u8); +void ItemUseOutOfBattle_WailmerPail(u8); void sub_80C9D74(u8); +void ItemUseOutOfBattle_Medicine(u8); +void ItemUseOutOfBattle_SacredAsh(u8); +void ItemUseOutOfBattle_PPRecovery(u8); +void ItemUseOutOfBattle_PPUp(u8); +void ItemUseOutOfBattle_RareCandy(u8); void ItemUseOutOfBattle_TMHM(u8); void sub_80C9EE4(u8); void sub_80C9F10(u8); void sub_80C9F80(u8); void sub_80C9FC0(u8); +void ItemUseOutOfBattle_Repel(u8); +void ItemUseOutOfBattle_BlackWhiteFlute(u8); void task08_080A1C44(u8); u8 sub_80CA1C8(void); +void ItemUseOutOfBattle_EscapeRope(u8); void ItemUseOutOfBattle_EvolutionStone(u8); +void ItemUseInBattle_PokeBall(u8); +void ItemUseInBattle_StatIncrease(u8); +void ItemUseInBattle_Medicine(u8); +void ItemUseInBattle_PPRecovery(u8); +void ItemUseInBattle_Escape(u8); +void ItemUseOutOfBattle_EnigmaBerry(u8); +void ItemUseInBattle_EnigmaBerry(u8); void ItemUseOutOfBattle_CannotUse(u8); #endif // GUARD_ITEM_USE_H diff --git a/include/menu.h b/include/menu.h index 9b48ab79b..9b48ab79b 100755..100644 --- a/include/menu.h +++ b/include/menu.h diff --git a/include/menu_helpers.h b/include/menu_helpers.h index 1df5053e7..1df5053e7 100755..100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h diff --git a/include/pokeblock.h b/include/pokeblock.h index 0d8e965e4..0d8e965e4 100755..100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h diff --git a/include/pokemon.h b/include/pokemon.h index 9dd7ba06c..9dd7ba06c 100755..100644 --- a/include/pokemon.h +++ b/include/pokemon.h diff --git a/include/pokenav.h b/include/pokenav.h index 70cc4135f..70cc4135f 100755..100644 --- a/include/pokenav.h +++ b/include/pokenav.h diff --git a/include/region_map.h b/include/region_map.h index 6dfa4dcf0..6dfa4dcf0 100755..100644 --- a/include/region_map.h +++ b/include/region_map.h diff --git a/include/strings.h b/include/strings.h index fe9cfc6ba..fe9cfc6ba 100755..100644 --- a/include/strings.h +++ b/include/strings.h diff --git a/include/text.h b/include/text.h index e9e8eb8c2..99987d2c3 100644 --- a/include/text.h +++ b/include/text.h @@ -66,6 +66,8 @@ #define CHAR_y 0xED #define CHAR_z 0xEE #define CHAR_COLON 0xF0 +#define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog +#define CHAR_PROMPT_CLEAR 0xFB // waits for button press and clears dialog #define EXT_CTRL_CODE_BEGIN 0xFC // extended control code #define PLACEHOLDER_BEGIN 0xFD // string placeholder #define CHAR_NEWLINE 0xFE diff --git a/include/vars.h b/include/vars.h index e08f344d4..e08f344d4 100755..100644 --- a/include/vars.h +++ b/include/vars.h |