diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 15 | ||||
| -rw-r--r-- | include/contest.h | 1 | ||||
| -rw-r--r-- | include/graphics.h | 3 | ||||
| -rw-r--r-- | include/pokemon_icon.h | 2 | ||||
| -rw-r--r-- | include/tv.h | 1 |
5 files changed, 22 insertions, 0 deletions
diff --git a/include/battle.h b/include/battle.h index 544e65b80..789167197 100644 --- a/include/battle.h +++ b/include/battle.h @@ -708,6 +708,21 @@ 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; + +extern u8 gDisplayedStringBattle[]; + // asm/battle_1.o void sub_800D6D4(); void sub_800D74C(); diff --git a/include/contest.h b/include/contest.h index 557b9e5c4..308fb9525 100644 --- a/include/contest.h +++ b/include/contest.h @@ -277,5 +277,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/graphics.h b/include/graphics.h index 889dc3916..bdb2b160e 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3345,4 +3345,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 diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index a1a965d81..ad0e4b56b 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -15,6 +15,8 @@ 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); u16 mon_icon_convert_unown_species_id(u16 species, u32 personality); +extern const u8 gMonIconPaletteIndices[]; #endif // GUARD_POKEMON_ICON_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); |