From 3f54c7caa1c40692f3f8c2b7660b0459dac38c0e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 10 Jan 2020 11:51:13 -0500 Subject: Port script_pokemon_util_80A0058 --- include/script_pokemon_util_80A0058.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util_80A0058.h index b63a7b0ef..d0b8949e4 100644 --- a/include/script_pokemon_util_80A0058.h +++ b/include/script_pokemon_util_80A0058.h @@ -4,7 +4,7 @@ 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); #endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H -- cgit v1.2.3 From 3e79c7890fe3196f3c9142a796e18f9b628dd762 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 10 Jan 2020 16:32:32 -0500 Subject: through UpdateLvlInHealthbox --- include/graphics.h | 3 +++ include/pokemon_summary_screen.h | 1 + 2 files changed, 4 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index dc0389420..03c9e5de6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4854,4 +4854,7 @@ extern const u32 gFireRedTrainerCard_Gfx[]; extern const u16 gEmeraldTrainerCard_Pal[]; extern const u32 gEmeraldTrainerCard_Gfx[]; +// battle_interface +extern const u8 gHealthboxElementsGfxTable[][32]; + #endif //GUARD_GRAPHICS_H diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 3695d46df..6f96fa86d 100644 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -34,5 +34,6 @@ enum PokemonSummaryScreenPage s32 GetLastViewedMonIndex(void); void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4); +extern const u8 *gNatureNames[]; #endif // GUARD_POKEMON_SUMMARY_SCREEN_H -- cgit v1.2.3 From 3310aadb548f11b356a6fb10a049aff6704dc82b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 10 Jan 2020 21:34:44 -0500 Subject: Much battle_interface data to C --- include/graphics.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 03c9e5de6..a668364bd 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4855,6 +4855,10 @@ 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 -- cgit v1.2.3 From 9d2f1af103fb52ec5d06e185a4ddf25d91554549 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 11 Jan 2020 10:58:30 -0500 Subject: through PrintSafariMonInfo --- include/pokemon_summary_screen.h | 1 - include/text.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 6f96fa86d..3695d46df 100644 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -34,6 +34,5 @@ enum PokemonSummaryScreenPage s32 GetLastViewedMonIndex(void); void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4); -extern const u8 *gNatureNames[]; #endif // GUARD_POKEMON_SUMMARY_SCREEN_H diff --git a/include/text.h b/include/text.h index 578a0d735..eaf125b05 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); -- cgit v1.2.3 From d09a3d7f1c6efc990b44b5ea240b36147d94104a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 12 Jan 2020 11:17:58 -0500 Subject: through TryAddPokeballIconToHealthbox --- include/battle_interface.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') 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 -- cgit v1.2.3 From ae41a2742ced950f37cbe1b21cdf394483ebd05b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 12 Jan 2020 12:13:03 -0500 Subject: Finish battle_interface.c decomp --- include/battle_message.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') 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 -- cgit v1.2.3 From 034f597482adb0ec1bf4bb6b766dbad587eac588 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 12 Jan 2020 14:34:54 -0500 Subject: Address review comments, 2 --- include/script_pokemon_util.h | 11 +++++++++++ include/script_pokemon_util_80A0058.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 include/script_pokemon_util.h delete mode 100644 include/script_pokemon_util_80A0058.h (limited to 'include') diff --git a/include/script_pokemon_util.h b/include/script_pokemon_util.h new file mode 100644 index 000000000..f02193538 --- /dev/null +++ b/include/script_pokemon_util.h @@ -0,0 +1,11 @@ +#ifndef GUARD_SCRIPT_POKEMON_UTIL_80A0058_H +#define GUARD_SCRIPT_POKEMON_UTIL_80A0058_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 HealPlayerParty(void); +void ReducePlayerPartyToThree(void); +void CreateScriptedWildMon(u16 species, u8 level, u16 item); + +#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util_80A0058.h deleted file mode 100644 index f02193538..000000000 --- a/include/script_pokemon_util_80A0058.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef GUARD_SCRIPT_POKEMON_UTIL_80A0058_H -#define GUARD_SCRIPT_POKEMON_UTIL_80A0058_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 HealPlayerParty(void); -void ReducePlayerPartyToThree(void); -void CreateScriptedWildMon(u16 species, u8 level, u16 item); - -#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H -- cgit v1.2.3 From 483613e128d8dc5b419ea9ff83c92aa2e4e55042 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 12 Jan 2020 14:45:53 -0500 Subject: Fix header guard --- include/script_pokemon_util.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/script_pokemon_util.h b/include/script_pokemon_util.h index f02193538..5f7dc4306 100644 --- a/include/script_pokemon_util.h +++ b/include/script_pokemon_util.h @@ -1,5 +1,5 @@ -#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); @@ -8,4 +8,4 @@ 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 -- cgit v1.2.3