diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/field_specials.h | 3 | ||||
| -rw-r--r-- | include/constants/flags.h | 4 | ||||
| -rw-r--r-- | include/item_menu.h | 2 | ||||
| -rw-r--r-- | include/link.h | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h index 5ec38d1d4..cbc5e96a3 100644 --- a/include/constants/field_specials.h +++ b/include/constants/field_specials.h @@ -49,4 +49,7 @@ #define DEPT_STORE_FLOORNUM_11F 14 #define DEPT_STORE_FLOORNUM_ROOFTOP 15 +// Pokemon Trainer Fan Club +#define NUM_TRAINER_CLUB_MEMBERS 8 + #endif // GUARD_CONSTANTS_FIELD_SPECIALS_H diff --git a/include/constants/flags.h b/include/constants/flags.h index 54778435e..00aa328f7 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -872,7 +872,7 @@ #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE 0x33D #define FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE 0x33E #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS 0x33F -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS 0x340 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER 0x340 #define FLAG_HIDE_GRANITE_CAVE_STEVEN 0x341 #define FLAG_HIDE_ROUTE_128_STEVEN 0x342 #define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY 0x343 @@ -913,7 +913,7 @@ #define FLAG_HIDE_LANETTES_HOUSE_LANETTE 0x366 #define FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE 0x367 #define FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN 0x368 -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT 0x369 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT 0x369 #define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL 0x36A #define FLAG_HIDE_ROUTE_111_PLAYER_DESCENT 0x36B #define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL 0x36C diff --git a/include/item_menu.h b/include/item_menu.h index b1275549d..a21a6da4f 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -82,7 +82,7 @@ void CB2_GoToSellMenu(void); void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()); void DoWallyTutorialBagMenu(void); void ResetBagScrollPositions(void); -void sub_81AABF0(void (*callback)(void)); +void ChooseBerrySetCallback(void (*callback)(void)); void CB2_ChooseBerry(void); void unknown_ItemMenu_Confirm(u8 taskId); void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*); diff --git a/include/link.h b/include/link.h index 499405fc1..32dfaf51e 100644 --- a/include/link.h +++ b/include/link.h @@ -87,7 +87,7 @@ #define LINKTYPE_0x2288 0x2288 // battle? #define LINKTYPE_0x3311 0x3311 #define LINKTYPE_0x3322 0x3322 -#define LINKTYPE_0x4411 0x4411 +#define LINKTYPE_BERRY_BLENDER_SETUP 0x4411 #define LINKTYPE_BERRY_BLENDER 0x4422 #define LINKTYPE_0x5501 0x5501 // mystery event #define LINKTYPE_0x5502 0x5502 // unused? @@ -290,7 +290,7 @@ void sub_800AF18(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 un void sub_800B348(void); void sub_800B3A4(u32 who); bool32 sub_800A07C(void); -void sub_800AB98(void); +void ResetLinkPlayerCount(void); void sub_800AA04(u8 a0); void sub_800B4C0(void); bool32 sub_800B504(void); |