From 2d9327a1ff21ac142c17e270755c658491eee5aa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 27 Feb 2020 14:21:13 -0500 Subject: Document Four Island scripts, trainer_card.inc --- include/constants/flags.h | 2 +- include/constants/trainer_card.h | 15 +++++++++++++++ include/trainer_card.h | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 include/constants/trainer_card.h (limited to 'include') diff --git a/include/constants/flags.h b/include/constants/flags.h index 7555f3c6b..44ef7e22f 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -670,7 +670,7 @@ #define FLAG_SILPH_11F_DOOR 0x28D #define FLAG_0x28E 0x28E #define FLAG_0x28F 0x28F -#define FLAG_MET_STICKER_LADY 0x290 +#define FLAG_MET_STICKER_MAN 0x290 #define FLAG_PALLET_LADY_NOT_BLOCKING_SIGN 0x291 #define FLAG_GOT_VS_SEEKER 0x292 #define FLAG_GOT_TM19_FROM_ERIKA 0x293 diff --git a/include/constants/trainer_card.h b/include/constants/trainer_card.h new file mode 100644 index 000000000..cdc69d610 --- /dev/null +++ b/include/constants/trainer_card.h @@ -0,0 +1,15 @@ +#ifndef GUARD_CONSTANTS_TRAINER_CARD_H +#define GUARD_CONSTANTS_TRAINER_CARD_H + +#define TRAINER_CARD_PROFILE_LENGTH 4 +#define TRAINER_CARD_STICKER_TYPES 3 + +#define CARD_TYPE_FRLG 0 +#define CARD_TYPE_RSE 1 + +#define MON_ICON_TINT_NORMAL 0 +#define MON_ICON_TINT_BLACK 1 +#define MON_ICON_TINT_PINK 2 +#define MON_ICON_TINT_SEPIA 3 + +#endif // GUARD_CONSTANTS_TRAINER_CARD_H diff --git a/include/trainer_card.h b/include/trainer_card.h index ed3e803d5..1355f682f 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -1,6 +1,8 @@ #ifndef GUARD_TRAINER_CARD_H #define GUARD_TRAINER_CARD_H +#include "constants/trainer_card.h" + struct TrainerCard { /*0x00*/ u8 gender; -- cgit v1.2.3 From 968ac4742adbc86148e344c7c0cb9b9f27addc6c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 27 Feb 2020 17:15:27 -0500 Subject: Sync trainer_card.c --- include/constants/facility_trainer_classes.h | 8 ++++---- include/constants/flags.h | 3 +++ include/constants/trainer_card.h | 2 ++ include/graphics.h | 8 ++++---- include/trainer_card.h | 12 ++++++------ include/trainer_pokemon_sprites.h | 2 +- 6 files changed, 20 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/constants/facility_trainer_classes.h b/include/constants/facility_trainer_classes.h index 10500ff35..fe94608dd 100644 --- a/include/constants/facility_trainer_classes.h +++ b/include/constants/facility_trainer_classes.h @@ -133,10 +133,10 @@ #define FACILITY_CLASS_CRUSH_KIN 0x81 #define FACILITY_CLASS_SIS_AND_BRO_2 0x82 #define FACILITY_CLASS_PKMN_PROF 0x83 -#define FACILITY_CLASS_PLAYER 0x84 -#define FACILITY_CLASS_PLAYER_2 0x85 -#define FACILITY_CLASS_PLAYER_3 0x86 -#define FACILITY_CLASS_PLAYER_4 0x87 +#define FACILITY_CLASS_BRENDAN 0x84 +#define FACILITY_CLASS_MAY 0x85 +#define FACILITY_CLASS_RED 0x86 +#define FACILITY_CLASS_LEAF 0x87 #define FACILITY_CLASS_TEAM_ROCKET_2 0x88 #define FACILITY_CLASS_PSYCHIC_4 0x89 #define FACILITY_CLASS_CRUSH_GIRL 0x8A diff --git a/include/constants/flags.h b/include/constants/flags.h index 44ef7e22f..11b09512f 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1327,6 +1327,7 @@ #define FLAG_0x808 (SYS_FLAGS + 0x8) #define PERMA_SYS_FLAGS_START 0x820 + #define FLAG_BADGE01_GET (SYS_FLAGS + 0x20) #define FLAG_BADGE02_GET (SYS_FLAGS + 0x21) #define FLAG_BADGE03_GET (SYS_FLAGS + 0x22) @@ -1335,6 +1336,8 @@ #define FLAG_BADGE06_GET (SYS_FLAGS + 0x25) #define FLAG_BADGE07_GET (SYS_FLAGS + 0x26) #define FLAG_BADGE08_GET (SYS_FLAGS + 0x27) +#define NUM_BADGES (1 + FLAG_BADGE08_GET - FLAG_BADGE01_GET) + #define FLAG_SYS_POKEMON_GET (SYS_FLAGS + 0x28) #define FLAG_SYS_POKEDEX_GET (SYS_FLAGS + 0x29) #define FLAG_0x82A (SYS_FLAGS + 0x2A) diff --git a/include/constants/trainer_card.h b/include/constants/trainer_card.h index cdc69d610..67901eb27 100644 --- a/include/constants/trainer_card.h +++ b/include/constants/trainer_card.h @@ -12,4 +12,6 @@ #define MON_ICON_TINT_PINK 2 #define MON_ICON_TINT_SEPIA 3 +#define NUM_LINK_TRAINER_CARD_CLASSES 8 + #endif // GUARD_CONSTANTS_TRAINER_CARD_H diff --git a/include/graphics.h b/include/graphics.h index dcc4c44a7..1405cdcf1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4845,10 +4845,10 @@ extern const u32 gBuyMenuFrame_Pal[]; extern const u16 gUnknown_8D2FBB4[]; // trainer card -extern const u16 gFireRedTrainerCard_Pal[]; -extern const u32 gFireRedTrainerCard_Gfx[]; -extern const u16 gEmeraldTrainerCard_Pal[]; -extern const u32 gEmeraldTrainerCard_Gfx[]; +extern const u16 gKantoTrainerCard_Pal[]; +extern const u32 gKantoTrainerCard_Gfx[]; +extern const u16 gHoennTrainerCard_Pal[]; +extern const u32 gHoennTrainerCard_Gfx[]; // battle_interface extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[]; diff --git a/include/trainer_card.h b/include/trainer_card.h index 1355f682f..5e7302659 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -25,19 +25,19 @@ struct TrainerCard /*0x1E*/ u16 pokeblocksWithFriends; /*0x20*/ u16 pokemonTrades; /*0x24*/ u32 money; - /*0x28*/ u16 var_28[4]; + /*0x28*/ u16 easyChatProfile[TRAINER_CARD_PROFILE_LENGTH]; /*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x38*/ u8 version; - /*0x3A*/ u16 var_3A; + /*0x3A*/ bool16 hasAllFrontierSymbols; /*0x3C*/ u32 berryCrushPoints; /*0x40*/ u32 unionRoomNum; /*0x44*/ u32 berriesPicked; /*0x48*/ u32 jumpsInRow; - /*0x4C*/ bool8 var_4C; + /*0x4C*/ bool8 shouldDrawStickers; /*0x4D*/ bool8 hasAllMons; - /*0x4E*/ u8 var_4E; - /*0x4F*/ u8 var_4F; - /*0x50*/ u8 var_50[4]; + /*0x4E*/ u8 monIconTint; + /*0x4F*/ u8 facilityClass; + /*0x50*/ u8 stickers[TRAINER_CARD_STICKER_TYPES]; /*0x54*/ u16 monSpecies[PARTY_SIZE]; }; diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h index 436a791e9..23f6e2cab 100644 --- a/include/trainer_pokemon_sprites.h +++ b/include/trainer_pokemon_sprites.h @@ -3,7 +3,7 @@ #include "global.h" -u16 sub_810C330(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId); +u16 CreateTrainerCardTrainerPicSprite(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId); bool16 ResetAllPicSprites(void); u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); -- cgit v1.2.3 From 7d7c51973ca025f03de1391b87b37876d3d9e90d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 28 Feb 2020 00:22:34 -0500 Subject: Document Five Island scripts --- include/constants/metatile_labels.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 01140a160..75804bfd9 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -190,4 +190,8 @@ #define METATILE_FuchsiaCity_SafariZoneTreeTopMiddle_Mowed 0x311 #define METATILE_FuchsiaCity_SafariZoneTreeTopRight_Mowed 0x312 +// gTileset_SeviiIslands45 +#define METATILE_SeviiIslands45_RocketWarehouseDoor_Locked 0x30B +#define METATILE_SeviiIslands45_RocketWarehouseDoor_Unlocked 0x2AF + #endif // GUARD_METATILE_LABELS_H -- cgit v1.2.3 From 9b9ae3d3374dd61870d47f025ffc0346a0b6839c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 29 Feb 2020 14:30:01 -0500 Subject: through sub_8080E6C --- include/event_scripts.h | 5 +++++ include/field_message_box.h | 1 + include/link.h | 5 ++++- include/strings.h | 7 +++++++ include/trainer_card.h | 7 ++++++- 5 files changed, 23 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h index bf16ed2ec..7cd51fa98 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1204,4 +1204,9 @@ extern const u8 EventScript_BagItemCanBeRegistered[]; // fldeff_cut extern const u8 EventScript_FldEffCut[]; +// cable_club +extern const u8 CableClub_Text_WhenAllPlayersReadyAConfirmBCancel[]; +extern const u8 CableClub_Text_AwaitingLinkupBCancel[]; +extern const u8 CableClub_Text_StartLinkWithXPlayersAConfirmBCancel[]; + #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/field_message_box.h b/include/field_message_box.h index 5777921b7..a6ef14aae 100644 --- a/include/field_message_box.h +++ b/include/field_message_box.h @@ -8,5 +8,6 @@ bool8 sub_8098238(const u8 *message); bool8 ShowFieldAutoScrollMessage(const u8 *message); void HideFieldMessageBox(void); bool8 IsFieldMessageBoxHidden(void); +bool8 textbox_any_visible(void); #endif // GUARD_FIELD_MESSAGE_BOX_H diff --git a/include/link.h b/include/link.h index e36ac8078..820e03e6c 100644 --- a/include/link.h +++ b/include/link.h @@ -272,12 +272,15 @@ void ClearLinkCallback_2(void); void LinkRfu_SetRfuFuncToSend6600(void); void IntlConvertLinkPlayerName(struct LinkPlayer * linkPlayer); bool8 IsWirelessAdapterConnected(void); -bool8 sub_800A474(u8 a0); +bool8 sub_800A474(u8 blockRequestType); void LinkVSync(void); bool8 HandleLinkConnection(void); void PrepareLocalLinkPlayerBlock(void); void LinkPlayerFromBlock(u32 who); void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06); u8 sub_800A8D4(void); +void sub_800AA24(void); +void sub_800A900(u8 a0); +u8 sub_800A8A4(void); #endif // GUARD_LINK_H diff --git a/include/strings.h b/include/strings.h index 8c19ea5cb..ec5965b75 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1141,4 +1141,11 @@ extern const u8 gText_BestScore2[]; extern const u8 gText_ExcellentsInARow[]; extern const u8 gText_PkmnJumpRecords[]; +// cable_club +extern const u8 gUnknown_841DF82[]; +extern const u8 gUnknown_841DF8B[]; +extern const u8 gUnknown_841DF92[]; +extern const u8 gUnknown_841DF99[]; +extern const u8 gUnknown_841DFA0[]; + #endif //GUARD_STRINGS_H diff --git a/include/trainer_card.h b/include/trainer_card.h index ed3e803d5..2bf20b045 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -1,7 +1,7 @@ #ifndef GUARD_TRAINER_CARD_H #define GUARD_TRAINER_CARD_H -struct TrainerCard +struct TrainerCardRSE { /*0x00*/ u8 gender; /*0x01*/ u8 stars; @@ -25,6 +25,11 @@ struct TrainerCard /*0x24*/ u32 money; /*0x28*/ u16 var_28[4]; /*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; +}; + +struct TrainerCard +{ + /*0x00*/ struct TrainerCardRSE rse; /*0x38*/ u8 version; /*0x3A*/ u16 var_3A; /*0x3C*/ u32 berryCrushPoints; -- cgit v1.2.3 From 21dddd57605cf4cbc31f0a903cc50a8f588817ff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 29 Feb 2020 16:31:57 -0500 Subject: Finish cable_club.c --- include/battle_records.h | 1 + include/event_scripts.h | 1 + include/link.h | 7 +++++++ include/overworld.h | 6 ++++++ include/quest_log.h | 1 + include/union_room.h | 1 + 6 files changed, 17 insertions(+) (limited to 'include') diff --git a/include/battle_records.h b/include/battle_records.h index 97f28a3b0..b66fbd686 100644 --- a/include/battle_records.h +++ b/include/battle_records.h @@ -2,5 +2,6 @@ #define GUARD_BATTLE_RECORDS_H void ClearPlayerLinkBattleRecords(void); +void TryRecordLinkBattleOutcome(s32 battlerId); #endif // GUARD_BATTLE_RECORDS_H diff --git a/include/event_scripts.h b/include/event_scripts.h index 7cd51fa98..91fba4e1e 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1208,5 +1208,6 @@ extern const u8 EventScript_FldEffCut[]; extern const u8 CableClub_Text_WhenAllPlayersReadyAConfirmBCancel[]; extern const u8 CableClub_Text_AwaitingLinkupBCancel[]; extern const u8 CableClub_Text_StartLinkWithXPlayersAConfirmBCancel[]; +extern const u8 CableClub_Text_PleaseWaitBCancel[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/link.h b/include/link.h index 820e03e6c..e5a40d6a5 100644 --- a/include/link.h +++ b/include/link.h @@ -77,6 +77,10 @@ #define LINKTYPE_BATTLE_TOWER_50 0x2266 #define LINKTYPE_BATTLE_TOWER_OPEN 0x2277 #define LINKTYPE_BATTLE_TOWER 0x2288 +#define LINKTYPE_0x3311 0x3311 +#define LINKTYPE_0x3322 0x3322 +#define LINKTYPE_0x4411 0x4411 +#define LINKTYPE_0x6601 0x6601 #define MASTER_HANDSHAKE 0x8FFF #define SLAVE_HANDSHAKE 0xB9A0 @@ -199,6 +203,7 @@ extern u16 word_3002910[]; extern bool8 gReceivedRemoteLinkPlayers; extern bool8 gLinkVSyncDisabled; extern u8 gWirelessCommType; +extern struct LinkPlayer gLocalLinkPlayer; extern u8 gShouldAdvanceLinkState; extern u16 gLinkPartnersHeldKeys[6]; @@ -282,5 +287,7 @@ u8 sub_800A8D4(void); void sub_800AA24(void); void sub_800A900(u8 a0); u8 sub_800A8A4(void); +void sub_800A9A4(void); +void SetLocalLinkPlayerId(u8 playerId); #endif // GUARD_LINK_H diff --git a/include/overworld.h b/include/overworld.h index f0a168052..60bf34ae7 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -177,6 +177,12 @@ void sub_805546C(u8 a0); bool32 sub_80582E0(void); bool32 sub_8058274(void); u8 GetCurrentMapBattleScene(void); +void sub_8055DB8(void); +void sub_8057F5C(void); +void sub_8057F34(void); +u32 sub_8057EC0(void); +void sub_8057F70(void); +void sub_8057F48(void); extern u16 gHeldKeyCodeToSend; diff --git a/include/quest_log.h b/include/quest_log.h index 25d0d5871..6497ef69c 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -50,5 +50,6 @@ void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value); void sub_8110840(void *oldSave); void sub_8112F18(u8 windowId); bool8 sub_8111C2C(void); +void Special_UpdateTrainerFansAfterLinkBattle(void); #endif //GUARD_QUEST_LOG_H diff --git a/include/union_room.h b/include/union_room.h index e24bcd480..e4cdef561 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -163,5 +163,6 @@ extern u16 gUnionRoomOfferedSpecies; extern u8 gUnionRoomRequestedMonType; void StartUnionRoomBattle(u16 battleFlags); +u8 UnionRoom_CreateTask_CallBC2ReturnFromLinkTrade(void); #endif //GUARD_UNION_ROOM_H -- cgit v1.2.3 From cbd380f2bf6738ec9222a2284e9de2297f0dc413 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 29 Feb 2020 17:01:03 -0500 Subject: Name many functions in cable_club.c --- include/cable_club.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/cable_club.h b/include/cable_club.h index c1dbab1a5..57515efc7 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -9,7 +9,7 @@ // Exported ROM declarations void sub_8081A90(u8 taskId); -u8 sub_8081150(void); -void sub_8081668(void); +u8 CreateTask_ReestablishLinkInCableClubRoom(void); +void CB2_ReturnFromCableClubBattle(void); #endif //GUARD_CABLE_CLUB_H -- cgit v1.2.3 From c36ef94a0dae1e60a8e641aced35ee2084c183eb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 29 Feb 2020 21:00:31 -0500 Subject: address review comments --- include/union_room.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/union_room.h b/include/union_room.h index e4cdef561..d520e8763 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -163,6 +163,6 @@ extern u16 gUnionRoomOfferedSpecies; extern u8 gUnionRoomRequestedMonType; void StartUnionRoomBattle(u16 battleFlags); -u8 UnionRoom_CreateTask_CallBC2ReturnFromLinkTrade(void); +u8 UnionRoom_CreateTask_CallCB2ReturnFromLinkTrade(void); #endif //GUARD_UNION_ROOM_H -- cgit v1.2.3 From a1995d8029d77e8768e4953e4f30cc3e3a57b419 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 10:35:41 -0500 Subject: Fix alignment --- include/trainer_card.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/trainer_card.h b/include/trainer_card.h index 4bebc7ed1..09b9a253a 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -37,7 +37,7 @@ struct TrainerCard /*0x3C*/ u32 berryCrushPoints; /*0x40*/ u32 unionRoomNum; /*0x44*/ u32 berriesPicked; - /*0x48*/ u32 jumpsInRow; + /*0x48*/ u32 jumpsInRow; /*0x4C*/ bool8 shouldDrawStickers; /*0x4D*/ bool8 hasAllMons; /*0x4E*/ u8 monIconTint; -- cgit v1.2.3