diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_interface.h | 4 | ||||
| -rw-r--r-- | include/battle_message.h | 3 | ||||
| -rw-r--r-- | include/graphics.h | 7 | ||||
| -rw-r--r-- | include/script_pokemon_util.h (renamed from include/script_pokemon_util_80A0058.h) | 8 | ||||
| -rw-r--r-- | include/text.h | 2 |
5 files changed, 17 insertions, 7 deletions
diff --git a/include/battle_interface.h b/include/battle_interface.h index 162faa8cb..01f3c4b29 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -79,8 +79,8 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem s32 sub_8074AA0(u8 bank, u8 healthboxSpriteId, u8 whichBar, u8 arg3); u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale); u8 GetHPBarLevel(s16 hp, s16 maxhp); -void sub_80496C0(u8 spriteId, struct Pokemon *mon); -void sub_804981C(u8 spriteId, u8); +void UpdateNickInHealthbox(u8 spriteId, struct Pokemon *mon); +void TryAddPokeballIconToHealthbox(u8 spriteId, u8); s32 MoveBattleBar(u8 battler, u8 healthboxSpriteId, u8 whichBar, u8 arg3); #endif // GUARD_BATTLE_INTERFACE_H diff --git a/include/battle_message.h b/include/battle_message.h index 612b253cf..2e2baa278 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -248,4 +248,7 @@ extern const u8 gUnknown_83FE85C[]; extern const u8 gUnknown_83FE860[]; extern const u8 gUnknown_83FE864[]; +extern const u8 gText_SafariBalls[]; +extern const u8 gText_HighlightRed_Left[]; + #endif // GUARD_BATTLE_MESSAGE_H diff --git a/include/graphics.h b/include/graphics.h index dc0389420..a668364bd 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4854,4 +4854,11 @@ extern const u32 gFireRedTrainerCard_Gfx[]; extern const u16 gEmeraldTrainerCard_Pal[]; extern const u32 gEmeraldTrainerCard_Gfx[]; +// battle_interface +extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[]; +extern const u8 gHealthboxElementsGfxTable[][32]; +extern const u16 gBattleInterface_BallStatusBarPal[]; +extern const u16 gBattleInterface_BallDisplayPal[]; +extern const u16 gUnknown_8D12404[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util.h index 75e826e93..5f7dc4306 100644 --- a/include/script_pokemon_util_80A0058.h +++ b/include/script_pokemon_util.h @@ -1,11 +1,11 @@ -#ifndef GUARD_SCRIPT_POKEMON_UTIL_80A0058_H -#define GUARD_SCRIPT_POKEMON_UTIL_80A0058_H +#ifndef GUARD_SCRIPT_POKEMON_UTIL_H +#define GUARD_SCRIPT_POKEMON_UTIL_H bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3); bool8 ScriptGiveEgg(u16 species); void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot); -void sp000_heal_pokemon(void); +void HealPlayerParty(void); void ReducePlayerPartyToThree(void); void CreateScriptedWildMon(u16 species, u8 level, u16 item); -#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H +#endif //GUARD_SCRIPT_POKEMON_UTIL_H diff --git a/include/text.h b/include/text.h index a15b42c92..e538123fd 100644 --- a/include/text.h +++ b/include/text.h @@ -250,7 +250,7 @@ u16 RenderText(struct TextPrinter *textPrinter); s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing); s32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32); s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing); -u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str); +u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str, int a3, int a4, int a5, int a6, int a7); u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y); u8 GetKeypadIconTileOffset(u8 keypadIconId); u8 GetKeypadIconWidth(u8 keypadIconId); |