diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/blend_palette.h | 6 | ||||
| -rw-r--r-- | include/cable_club.h | 1 | ||||
| -rw-r--r-- | include/field_message_box.h | 10 | ||||
| -rw-r--r-- | include/field_specials.h | 1 | ||||
| -rw-r--r-- | include/link.h | 11 | ||||
| -rw-r--r-- | include/menu.h | 1 | ||||
| -rw-r--r-- | include/overworld.h | 3 | ||||
| -rw-r--r-- | include/rom_8011DC0.h | 2 | ||||
| -rw-r--r-- | include/script_pokemon_util_80F87D8.h | 1 | ||||
| -rw-r--r-- | include/string_util.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 10 | ||||
| -rw-r--r-- | include/text.h | 1 | ||||
| -rw-r--r-- | include/trainer_card.h | 9 | ||||
| -rw-r--r-- | include/util.h | 1 |
14 files changed, 48 insertions, 11 deletions
diff --git a/include/blend_palette.h b/include/blend_palette.h deleted file mode 100644 index a00847bc3..000000000 --- a/include/blend_palette.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef GUARD_BLEND_PALETTE_H -#define GUARD_BLEND_PALETTE_H - -void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor); - -#endif // GUARD_BLEND_PALETTE_H diff --git a/include/cable_club.h b/include/cable_club.h index 8be376721..ebdc82b46 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -14,5 +14,6 @@ u8 sub_80B3050(void); void sub_80B360C(void); bool32 sub_80B2AF4(u16 *arg0, u16 *arg1); void sub_80B3AF8(u8 taskId); +void task00_08081A90(u8 taskId); #endif //GUARD_CABLE_CLUB_H diff --git a/include/field_message_box.h b/include/field_message_box.h index 432c9078b..e3deee4d6 100644 --- a/include/field_message_box.h +++ b/include/field_message_box.h @@ -1,10 +1,20 @@ #ifndef GUARD_FIELD_MESSAGE_BOX_H #define GUARD_FIELD_MESSAGE_BOX_H +enum +{ + FIELD_MESSAGE_BOX_HIDDEN, + FIELD_MESSAGE_BOX_UNUSED, + FIELD_MESSAGE_BOX_NORMAL, + FIELD_MESSAGE_BOX_AUTO_SCROLL, +}; + bool8 ShowFieldMessage(const u8 *message); bool8 sub_8098238(const u8 *message); bool8 ShowFieldAutoScrollMessage(const u8 *message); void HideFieldMessageBox(void); bool8 IsFieldMessageBoxHidden(void); +u8 GetFieldMessageBoxMode(void); +void sub_8098374(void); #endif // GUARD_FIELD_MESSAGE_BOX_H diff --git a/include/field_specials.h b/include/field_specials.h index c1f70a399..4709f9551 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -5,5 +5,6 @@ u8 GetLeadMonIndex(void); u8 sub_813B260(void); u16 get_unknown_box_id(void); bool8 InMultiBattleRoom(void); +void sub_813BF10(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/link.h b/include/link.h index 9561728bd..f12f0990f 100644 --- a/include/link.h +++ b/include/link.h @@ -97,7 +97,8 @@ enum EXCHANGE_IN_PROGRESS, EXCHANGE_STAT_4, EXCHANGE_STAT_5, - EXCHANGE_STAT_6 + EXCHANGE_STAT_6, + EXCHANGE_STAT_7 }; enum @@ -258,6 +259,8 @@ 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 sub_800AA04(u8 a0); extern u16 gLinkPartnersHeldKeys[6]; extern u32 gLinkDebugSeed; @@ -292,6 +295,7 @@ extern u32 gFiller_0300315c; extern u32 gFiller_03004138; extern u32 gFiller_0300413C; extern u32 gFiller_03003080; +extern struct LinkPlayer gLocalLinkPlayer; bool32 Link_AnyPartnersPlayingRubyOrSapphire(void); bool32 sub_800A03C(void); @@ -302,5 +306,10 @@ bool8 sub_800A4D8(u8 a0); u8 sub_800A9D8(void); u8 sub_800A0C8(s32, s32); u16 *sub_801B058(void); +u8 sub_800A9A8(void); +void sub_800AD10(void); +void sub_800AB18(void); +void sub_8009F18(void); +bool8 sub_800AA60(void); #endif // GUARD_LINK_H diff --git a/include/menu.h b/include/menu.h index cddab0870..2689b026c 100644 --- a/include/menu.h +++ b/include/menu.h @@ -87,5 +87,6 @@ void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP); void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram); +void sub_8197AE8(bool8 copyToVram); #endif // GUARD_MENU_H diff --git a/include/overworld.h b/include/overworld.h index f6856ab0c..3dce20ab2 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -25,6 +25,9 @@ extern u16 *gBGTilemapBuffers3; extern void (*gFieldCallback)(void); +extern u8 gUnknown_03005DB4; +extern u8 gFieldLinkPlayerCount; + // Exported ROM declarations extern const struct UCoords32 gDirectionToVectors[]; diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index f71e5d97d..b6ca0e248 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -9,5 +9,7 @@ void sub_8018438(void); u16 mevent_081445C0(u8); +void sub_801B990(u32, u32); +u8 sub_8013F78(void); #endif //GUARD_rom_8011DC0_H diff --git a/include/script_pokemon_util_80F87D8.h b/include/script_pokemon_util_80F87D8.h index 555b3428b..68aec7eb6 100644 --- a/include/script_pokemon_util_80F87D8.h +++ b/include/script_pokemon_util_80F87D8.h @@ -3,5 +3,6 @@ #define GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H u16 sub_80F903C(void); +void ReducePlayerPartyToThree(void); #endif // GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H diff --git a/include/string_util.h b/include/string_util.h index f26646082..7b685fcea 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -24,7 +24,7 @@ u8 *ConvertUIntToDecimalStringN(u8 *dest, u32 value, enum StringConvertMode mode u8 *ConvertIntToHexStringN(u8 *dest, s32 value, enum StringConvertMode mode, u8 n); u8 *StringExpandPlaceholders(u8 *dest, const u8 *src); u8 *StringBraille(u8 *dest, const u8 *src); -u8 *GetExpandedPlaceholder(u32 id); +const u8 *GetExpandedPlaceholder(u32 id); u8 *StringFill(u8 *dest, u8 c, u16 n); u8 *StringCopyPadded(u8 *dest, const u8 *src, u8 c, u16 n); u8 *StringFillWithTerminator(u8 *dest, u16 n); diff --git a/include/strings.h b/include/strings.h index e72360563..1a254c2ad 100644 --- a/include/strings.h +++ b/include/strings.h @@ -843,4 +843,14 @@ extern const u8 gText_TwoDashes[]; extern const u8 *const gReturnToXStringsTable2[]; +extern const u8 gText_XPLink[]; +extern const u8 gText_ConfirmLinkWhenPlayersReady[]; +extern const u8 gText_ConfirmStartLinkWithXPlayers[]; +extern const u8 gText_AwaitingLinkup[]; +extern const u8 gText_PleaseWaitForLink[]; +extern const u8 gText_BronzeCard[]; +extern const u8 gText_CopperCard[]; +extern const u8 gText_SilverCard[]; +extern const u8 gText_GoldCard[]; + #endif //GUARD_STRINGS_H diff --git a/include/text.h b/include/text.h index e2120efa3..f677f2ced 100644 --- a/include/text.h +++ b/include/text.h @@ -76,6 +76,7 @@ #define CHAR_y 0xED #define CHAR_z 0xEE #define CHAR_SPECIAL_F7 0xF7 +#define CHAR_SPECIAL_F8 0xF8 #define CHAR_SPECIAL_F9 0xF9 #define CHAR_COLON 0xF0 #define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog diff --git a/include/trainer_card.h b/include/trainer_card.h index af603444f..d80a5fa52 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -27,13 +27,16 @@ struct TrainerCard /*0x24*/ u32 money; /*0x28*/ u16 var_28[4]; /*0x30*/ u8 playerName[8]; - /*0x38*/ u8 emeraldAddedUnknownFields[0x64-0x38]; + /*0x38*/ u8 emeraldAddedUnknownFields[0x54-0x38]; + /*0x54*/ u16 monSpecies[2]; + /*0x58*/ u8 emeraldAddedUnknownFields2[0x64-0x58]; }; extern struct TrainerCard gTrainerCards[4]; void sub_80C3120(struct TrainerCard *arg0, u16 *arg1, u8 gameVersion); -void sub_80C4E74(u8 arg0, void (*callback)(void)); -void sub_80C30A4(u16 *arg0); +void TrainerCard_ShowLinkCard(u8 arg0, void (*callback)(void)); +void TrainerCard_GenerateCardForPlayer(struct TrainerCard *); +u8 sub_80C4904(u8); #endif // GUARD_TRAINER_CARD_H diff --git a/include/util.h b/include/util.h index 63887b13f..997c8f713 100644 --- a/include/util.h +++ b/include/util.h @@ -13,5 +13,6 @@ int CountTrailingZeroBits(u32 value); u16 CalcCRC16(u8 *data, s32 length); u16 CalcCRC16WithTable(u8 *data, u32 length); u32 CalcByteArraySum(const u8* data, u32 length); +void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor); #endif // GUARD_UTIL_H |