Finish item_use
This commit is contained in:
@@ -1,7 +1,12 @@
|
||||
#ifndef GUARD_BERRY_POUCH_H
|
||||
#define GUARD_BERRY_POUCH_H
|
||||
|
||||
#include "task.h"
|
||||
|
||||
void sub_813D808(u8 taskId);
|
||||
void sub_813D934(void (*)(void));
|
||||
void InitBerryPouch(u8, void (*)(void), u8);
|
||||
void sub_813EB20(u8 taskId, u8 bgId, const u8 * str, TaskFunc followUpFunc);
|
||||
void sub_813E2B8(u8 taskId);
|
||||
|
||||
#endif //GUARD_BERRY_POUCH_H
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
#ifndef GUARD_CONSTANTS_FLAGS_H
|
||||
#define GUARD_CONSTANTS_FLAGS_H
|
||||
|
||||
// Sys Flags Maybe
|
||||
#define FLAG_WHITE_FLUTE_ACTIVE 0x803
|
||||
#define FLAG_BLACK_FLUTE_ACTIVE 0x804
|
||||
|
||||
// World Map Flags
|
||||
#define FLAG_WORLD_MAP_PALLET_TOWN 0x890
|
||||
#define FLAG_WORLD_MAP_VIRIDIAN_CITY 0x891
|
||||
|
||||
@@ -35,8 +35,8 @@
|
||||
#define VAR_0x401D 0x401D
|
||||
#define VAR_0x401E 0x401E
|
||||
#define VAR_0x401F 0x401F
|
||||
#define VAR_RECYCLE_GOODS 0x4020
|
||||
#define VAR_REPEL_STEP_COUNT 0x4021
|
||||
#define VAR_REPEL_STEP_COUNT 0x4020
|
||||
#define VAR_0x4021 0x4021
|
||||
#define VAR_ICE_STEP_COUNT 0x4022
|
||||
#define VAR_0x4023 0x4023
|
||||
#define VAR_MIRAGE_RND_H 0x4024
|
||||
|
||||
@@ -82,5 +82,6 @@ bool8 FieldEffectActiveListContains(u8 id);
|
||||
void sub_80B69DC(void);
|
||||
void CreateTeleportFieldEffectTask(void);
|
||||
void FieldEffectActiveListRemove(u8 id);
|
||||
void sub_8085620(void);
|
||||
|
||||
#endif //GUARD_FIELD_EFFECTS_H
|
||||
|
||||
@@ -7,5 +7,6 @@ u8 GetLeadMonIndex(void);
|
||||
u8 CountDigits(u16 number);
|
||||
void TV_PrintIntToStringVar(u8, int);
|
||||
u16 ScrSpecial_GetStarter(void);
|
||||
void sub_80CCB68(void);
|
||||
|
||||
#endif // GUARD_FIELD_SPECIALS_H
|
||||
|
||||
+4
-1
@@ -27,12 +27,15 @@ void sub_81AAC50(void);
|
||||
void sub_81AAC70(void);
|
||||
void sub_8108CF0(void);
|
||||
void sub_810B108(u8);
|
||||
void UseFameCheckerFromMenu(void);
|
||||
void ReturnToBagFromKeyItem(void);
|
||||
void ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1, int pos2);
|
||||
void sub_8108B50(u8 taskId);
|
||||
void sub_8108CB4(void);
|
||||
void sub_8108EE0(void (*)(void));
|
||||
void DisplayItemMessageInBag(u8 taskId, u8 bgId, const u8 * string, TaskFunc followUpFunc);
|
||||
void sub_810A1F8(u8 taskId);
|
||||
void sub_8107ECC(void);
|
||||
void sub_8108DC8(u8 pocketId);
|
||||
void sub_81089F4(u8 pocketId);
|
||||
|
||||
#endif //GUARD_ITEM_MENU_H
|
||||
|
||||
+3
-3
@@ -12,7 +12,7 @@ void FieldUseFunc_OldRod(u8 taskId);
|
||||
void FieldUseFunc_CoinCase(u8 taskId);
|
||||
void FieldUseFunc_PowderJar(u8 taskId);
|
||||
void FieldUseFunc_PokeFlute(u8 taskId);
|
||||
void FieldUseFunc_OpenPartyMenu(u8 taskId);
|
||||
void FieldUseFunc_Medicine(u8 taskId);
|
||||
void FieldUseFunc_Ether(u8 taskId);
|
||||
void FieldUseFunc_PpUp(u8 taskId);
|
||||
void FieldUseFunc_RareCandy(u8 taskId);
|
||||
@@ -27,10 +27,10 @@ void FieldUseFunc_BlackFlute(u8 taskId);
|
||||
void FieldUseFunc_TownMap(u8 taskId);
|
||||
void FieldUseFunc_FameChecker(u8 taskId);
|
||||
void FieldUseFunc_VsSeeker(u8 taskId);
|
||||
void BattleUseFunc_MasterBall(u8 taskId);
|
||||
void BattleUseFunc_PokeBallEtc(u8 taskId);
|
||||
void BattleUseFunc_PokeFlute(u8 taskId);
|
||||
void BattleUseFunc_GuardSpec(u8 taskId);
|
||||
void BattleUseFunc_OpenPartyMenu(u8 taskId);
|
||||
void BattleUseFunc_Medicine(u8 taskId);
|
||||
void BattleUseFunc_Ether(u8 taskId);
|
||||
void BattleUseFunc_PokeDoll(u8 taskId);
|
||||
void FieldUseFunc_OakStopsYou(u8 taskId);
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef GUARD_ITEMFINDER_H
|
||||
#define GUARD_ITEMFINDER_H
|
||||
|
||||
void sub_813EC8C(u8 taskId);
|
||||
|
||||
#endif //GUARD_ITEMFINDER_H
|
||||
+1
-1
@@ -21,6 +21,6 @@ bool8 MonHasMail(struct Pokemon *mon);
|
||||
void TakeMailFromMon(struct Pokemon *mon);
|
||||
u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail);
|
||||
void ClearMailStruct(struct MailStruct *mail);
|
||||
void sub_80BEBEC(u16 *, void (*)(void), u8);
|
||||
void sub_80BEBEC(struct MailStruct * mail, void (* callback)(void), u8 a2);
|
||||
|
||||
#endif // GUARD_MAIL_H
|
||||
|
||||
@@ -115,5 +115,6 @@ void sub_8055DC4(void);
|
||||
bool8 sub_8055FC4(void);
|
||||
bool8 is_light_level_8_or_9(u8 mapType);
|
||||
bool32 sub_8055C9C(void);
|
||||
void sub_8054D70(void);
|
||||
|
||||
#endif //GUARD_ROM4_H
|
||||
|
||||
@@ -52,5 +52,14 @@ void GetMonNickname(const struct Pokemon * mon, u8 * dest);
|
||||
void sub_81202F8(const u8 * src, u8 a1);
|
||||
bool8 sub_8120370(void);
|
||||
void PartyMenuInit(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback);
|
||||
void sub_81252D0(u8 taskId, TaskFunc followUpFunc);
|
||||
void sub_81256F8(u8 taskId, TaskFunc followUpFunc);
|
||||
void dp05_pp_up(u8 taskId, TaskFunc followUpFunc);
|
||||
void dp05_rare_candy(u8 taskId, TaskFunc followUpFunc);
|
||||
void sub_8126B60(u8 taskId, TaskFunc followUpFunc);
|
||||
void sub_8126894(u8 taskId, TaskFunc followUpFunc);
|
||||
void sub_81279E0(void);
|
||||
void ItemUseCB_Medicine(u8 taskId, TaskFunc followUpFunc);
|
||||
u8 GetItemEffectType(u16 itemId);
|
||||
|
||||
#endif // GUARD_PARTY_MENU_H
|
||||
|
||||
@@ -678,4 +678,6 @@ u8 GetMonsStateToDoubles(void);
|
||||
void sub_803E0A4(struct Pokemon *mon, struct BattleTowerPokemon *src);
|
||||
void SetMultiuseSpriteTemplateToPokemon(u16 trainerSpriteId, u8 battlerPosition);
|
||||
|
||||
const u8 * sub_8042DA4(u16 itemId);
|
||||
|
||||
#endif // GUARD_POKEMON_H
|
||||
|
||||
@@ -95,5 +95,6 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag);
|
||||
u8 *GetMapName(u8 *, u16, u16);
|
||||
bool32 sub_8124668(u8 mapSecId);
|
||||
void sub_80C4DF8(u8 *, u8);
|
||||
void sub_80BFF50(u8 a0, void (*a1)(void));
|
||||
|
||||
#endif //GUARD_REGION_MAP_H
|
||||
|
||||
@@ -164,10 +164,16 @@ extern const u8 gText_ReturnToPC[];
|
||||
extern const u8 gUnknown_8416425[];
|
||||
extern const u8 gUnknown_8416451[];
|
||||
extern const u8 gUnknown_8416537[];
|
||||
extern const u8 gUnknown_841658C[];
|
||||
extern const u8 gUnknown_841659E[];
|
||||
extern const u8 gUnknown_84165D2[];
|
||||
extern const u8 gUnknown_8416600[];
|
||||
extern const u8 gUnknown_8416631[];
|
||||
extern const u8 gUnknown_8416644[];
|
||||
extern const u8 gUnknown_841665C[];
|
||||
extern const u8 gUnknown_8416690[];
|
||||
extern const u8 gUnknown_84166A7[];
|
||||
extern const u8 gUnknown_84169DC[];
|
||||
|
||||
extern const u8 gUnknown_84162BD[];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user