From ed82f1a44d04675e1e737a704f353261de08120d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 23 Jan 2018 11:11:32 -0500 Subject: sub_80C2020 --- include/battle.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index d3cbd24f5..fd60ced79 100644 --- a/include/battle.h +++ b/include/battle.h @@ -708,6 +708,19 @@ void MarkBufferBankForExecution(u8 bank); extern u8 gBattleTextBuff1[]; +extern u16 gBattle_BG0_X; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG3_X; +extern u16 gBattle_BG3_Y; +extern u16 gBattle_WIN0H; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN1H; +extern u16 gBattle_WIN1V; + // asm/battle_1.o void sub_800D6D4(); void sub_800D74C(); -- cgit v1.2.3 From 49ff4ad4e8f5cf8cea984e255ba3bb5051ff91e6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 23 Jan 2018 12:25:04 -0500 Subject: through sub_80C2340 --- include/battle.h | 2 ++ include/contest.h | 12 ++++++++++++ 2 files changed, 14 insertions(+) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index fd60ced79..7d8878018 100644 --- a/include/battle.h +++ b/include/battle.h @@ -721,6 +721,8 @@ extern u16 gBattle_WIN0V; extern u16 gBattle_WIN1H; extern u16 gBattle_WIN1V; +extern u8 gDisplayedStringBattle[]; + // asm/battle_1.o void sub_800D6D4(); void sub_800D74C(); diff --git a/include/contest.h b/include/contest.h index 6b1f1f520..b0bdd7f61 100644 --- a/include/contest.h +++ b/include/contest.h @@ -271,4 +271,16 @@ struct UnknownContestStruct6 #define shared19338 ((struct UnknownContestStruct4 *)(gSharedMem + 0x19338)) #define shared19348 (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348)) +extern u8 gContestPlayerMonIndex; +extern u8 gIsLinkContest; +extern u32 gContestRngValue; +extern u8 gUnknown_02038696[4]; +extern s16 gUnknown_02038670[4]; +extern s16 gUnknown_02038678[4]; +extern s16 gUnknown_02038680[4]; +extern u16 gUnknown_02038688[4]; +extern u8 gContestFinalStandings[4]; +extern u8 gUnknown_02038696[4]; +extern u8 gUnknown_0203869B; + #endif // GUARD_CONTEST_H -- cgit v1.2.3 From 1fd9669d422f8e412d73cfb48f0651483bee833c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 23 Jan 2018 23:09:02 -0500 Subject: contest_link_80C2020 data --- include/graphics.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 76a45f6f6..243d40fb9 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3337,4 +3337,7 @@ extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21; +extern const u8 gContestConfetti_Gfx[]; +extern const u8 gContestConfetti_Pal[]; + #endif // GUARD_GRAPHICS_H -- cgit v1.2.3 From 426b6a7290d3553ad1059e8f3a1d5e5009d2dafc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 23 Jan 2018 23:40:51 -0500 Subject: through sub_80C2EA0 --- include/contest.h | 1 + include/tv.h | 1 + 2 files changed, 2 insertions(+) (limited to 'include') diff --git a/include/contest.h b/include/contest.h index b0bdd7f61..f0e4c0b0d 100644 --- a/include/contest.h +++ b/include/contest.h @@ -282,5 +282,6 @@ extern u16 gUnknown_02038688[4]; extern u8 gContestFinalStandings[4]; extern u8 gUnknown_02038696[4]; extern u8 gUnknown_0203869B; +extern u16 gSpecialVar_ContestRank; #endif // GUARD_CONTEST_H diff --git a/include/tv.h b/include/tv.h index 2edccb365..3b4dda745 100644 --- a/include/tv.h +++ b/include/tv.h @@ -27,6 +27,7 @@ void sub_80BE160(TVShow *show); void sub_80BE160(TVShow *); void sub_80BE188(void); void sub_80BE23C(u16); +void sub_80BE284(u8 contestResult); void sub_80BE320(void); void StartMassOutbreak(void); void sub_80BE5FC(void); -- cgit v1.2.3 From b2bf04d83d607ec38011a1ef665cc8db0f679ba3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 26 Jan 2018 18:00:32 -0500 Subject: through (nonmatching) sub_80C3024 --- include/pokemon_icon.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 7e26c1c9b..20f82f882 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -12,5 +12,6 @@ void sub_809D580(u16); void sub_809D608(u16); void sub_809D62C(struct Sprite *sprite); void sub_809D824(struct Sprite *sprite, u8 animNum); +const u8 *GetMonIconPtr(u16 species, u32 personality); #endif // GUARD_POKEMON_ICON_H -- cgit v1.2.3 From 88680a64a4990fd0b4a6609574e734ccb1fd1d73 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 26 Jan 2018 21:58:04 -0500 Subject: LoadAllContestMonIcons --- include/pokemon_icon.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 20f82f882..258735502 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -13,5 +13,7 @@ void sub_809D608(u16); void sub_809D62C(struct Sprite *sprite); void sub_809D824(struct Sprite *sprite, u8 animNum); const u8 *GetMonIconPtr(u16 species, u32 personality); +u16 mon_icon_convert_unown_species_id(u16 species, u32 personality); +extern const u8 gMonIconPaletteIndices[]; #endif // GUARD_POKEMON_ICON_H -- cgit v1.2.3