Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start documenting healthbar.c #145

Merged
merged 16 commits into from
Feb 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions include/battle/battle_display.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

#include "struct_decls/sprite_decl.h"
#include "struct_decls/battle_system.h"
#include "struct_defs/battle_io.h"
#include "overlay016/struct_ov16_0225BFFC_decl.h"
#include "overlay016/struct_ov16_0225C168.h"
#include "overlay016/struct_ov16_0225C17C.h"
#include "overlay016/struct_ov16_0225C23C.h"
#include "overlay016/struct_ov16_0225C260.h"
#include "overlay016/struct_ov16_0225C29C.h"
#include "overlay016/struct_ov16_0225C2B0.h"
Expand All @@ -27,7 +27,6 @@
#include "overlay016/struct_ov16_0225C454.h"
#include "overlay016/struct_ov16_0225C468.h"
#include "overlay016/struct_ov16_0225C65C.h"
#include "struct_defs/battle_io.h"
#include "overlay016/struct_ov16_0225C9F0.h"
#include "overlay016/struct_ov16_0225CA4C.h"
#include "overlay016/struct_ov16_0225CA60.h"
Expand All @@ -52,8 +51,23 @@ void ov16_0225D228(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0
void ov16_0225D360(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265154 * param2);
void ov16_0225D3CC(BattleSystem * param0, BattlerData * param1);
void ov16_0225D414(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_022651A8 * param2);
void ov16_0225D4A8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C23C * param2);
void ov16_0225D570(BattleSystem * param0, BattlerData * param1);

/**
* @brief Slide the healthbar into the screen.
*
* @param battleSys
* @param battlerData
* @param healthbarData
*/
void BattleDisplay_SlideHealthbarIn(BattleSystem *battleSys, BattlerData *battlerData, HealthbarData *healthbarData);

/**
* @brief Slide the healthbar out of the screen.
*
* @param battleSys
* @param battlerData
*/
void BattleDisplay_SlideHealthbarOut(BattleSystem *battleSys, BattlerData *battlerData);
void ov16_0225D5B8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C260 * param2);
void ov16_0225D698(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_022656F0 * param2);
void ov16_0225D708(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C29C * param2);
Expand Down Expand Up @@ -139,7 +153,7 @@ void ov16_02263730(BattleSystem * param0, BattlerData * param1);
u8 Battler_Type(BattlerData * param0);
u8 Battler_BootState(BattlerData * param0);
Sprite * ov16_02263AFC(BattlerData * param0);
UnkStruct_ov16_022674C4 * ov16_02263B08(BattlerData * param0);
Healthbar * ov16_02263B08(BattlerData * param0);
UnkStruct_ov16_0226C378 * ov16_02263B0C(BattlerData * param0);
void ov16_02263B10(BattlerData * param0);
void ov16_02263B20(BattlerData * param0, int param1);
Expand Down
20 changes: 18 additions & 2 deletions include/battle/battle_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,24 @@ void BattleIO_SetTrainerEncounter(BattleSystem * param0, int param1);
void BattleIO_ThrowTrainerBall(BattleSystem * param0, int param1, int param2);
void BattleIO_SlideTrainerOut(BattleSystem * param0, int param1);
void BattleIO_SlideTrainerIn(BattleSystem * param0, int param1, int param2);
void BattleIO_SlideHPGaugeIn(BattleSystem * param0, BattleContext * param1, int param2, int param3);
void BattleIO_SlideHPGaugeOut(BattleSystem * param0, int param1);

/**
* @brief Slide the healthbar into the screen for a given battler.
*
* @param battleSys
* @param battleCtx
* @param battler
* @param delay Optional frame-delay to wait until execution.
*/
void BattleIO_SlideHealthbarIn(BattleSystem *battleSys, BattleContext *battleCtx, int battler, int delay);

/**
* @brief Slide the healthbar out of the screen for a given battler.
*
* @param battleSys
* @param battler
*/
void BattleIO_SlideHealthbarOut(BattleSystem *battleSys, int battler);
void BattleIO_SetCommandSelection(BattleSystem *battleSys, BattleContext *battleCtx, int battler, int partySlot);
void ov16_022656D4(BattleSystem * param0, int param1, int param2);
void BattleIO_ShowMoveSelectScreen(BattleSystem *battleSys, BattleContext *battleCtx, int battler);
Expand Down
144 changes: 144 additions & 0 deletions include/battle/healthbar.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
#ifndef POKEPLATINUM_OV16_02266F1C_H
#define POKEPLATINUM_OV16_02266F1C_H

#include "struct_decls/struct_02002F38_decl.h"
#include "struct_decls/struct_02006C24_decl.h"
#include "struct_decls/struct_0200C6E4_decl.h"
#include "struct_decls/struct_0200C704_decl.h"
#include "struct_decls/cell_actor_data.h"
#include "overlay016/struct_ov16_022674C4.h"

#define HEALTHBAR_INFO_NONE 0
#define HEALTHBAR_INFO_HP_GAUGE (1 << 0)
#define HEALTHBAR_INFO_CURRENT_HP (1 << 1)
#define HEALTHBAR_INFO_MAX_HP (1 << 2)
#define HEALTHBAR_INFO_LEVEL (1 << 3)
#define HEALTHBAR_INFO_NAME (1 << 4)
#define HEALTHBAR_INFO_EXP_GAUGE (1 << 5)
#define HEALTHBAR_INFO_GENDER (1 << 6)
#define HEALTHBAR_INFO_LEVEL_TEXT (1 << 7)
#define HEALTHBAR_INFO_STATUS (1 << 8)
#define HEALTHBAR_INFO_CAUGHT_SPECIES (1 << 9)
#define HEALTHBAR_INFO_COUNT_SAFARI_BALLS (1 << 10)
#define HEALTHBAR_INFO_REMAINING_SAFARI_BALLS (1 << 11)
#define HEALTHBAR_INFO_COUNT_PARK_BALLS (1 << 12)
#define HEALTHBAR_INFO_REMAINING_PARK_BALLS (1 << 13)

#define HEALTHBAR_INFO_ALL ~0

#define HEALTHBAR_INFO_ALL_SAFARI (HEALTHBAR_INFO_COUNT_SAFARI_BALLS | HEALTHBAR_INFO_REMAINING_SAFARI_BALLS)
#define HEALTHBAR_INFO_ALL_PARK (HEALTHBAR_INFO_COUNT_PARK_BALLS | HEALTHBAR_INFO_REMAINING_PARK_BALLS)
#define HEALTHBAR_INFO_NOT_ON_ENEMY (HEALTHBAR_INFO_CURRENT_HP | HEALTHBAR_INFO_MAX_HP | HEALTHBAR_INFO_EXP_GAUGE)

enum HealthbarType {
HEALTHBAR_TYPE_PLAYER_SOLO = 0,
HEALTHBAR_TYPE_ENEMY_SOLO,
HEALTHBAR_TYPE_PLAYER_SLOT_1,
HEALTHBAR_TYPE_ENEMY_SLOT_1,
HEALTHBAR_TYPE_PLAYER_SLOT_2,
HEALTHBAR_TYPE_ENEMY_SLOT_2,
HEALTHBAR_TYPE_SAFARI_ZONE,
HEALTHBAR_TYPE_PAL_PARK,
};

enum HealthbarScrollDirection {
HEALTHBAR_SCROLL_IN = 0,
HEALTHBAR_SCROLL_OUT,
};

enum HealthbarGaugeType {
HEALTHBAR_GAUGE_HP = 0,
HEALTHBAR_GAUGE_EXP,
};

/**
* @brief Load the resources required to display a healthbar.
*
* Though a NARC handle is required as a parameter, it is assumed to always be
* an open handle to pl_batt_obj.narc.
*
* @param renderer
* @param gfxHandler
* @param narc
* @param palette
* @param healthbarType
*/
void Healthbar_LoadResources(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, PaletteData *palette, enum HealthbarType healthbarType);
CellActorData * ov16_02267060(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2);

/**
* @brief Draw the informational parts of the healthbar, according to a set
* of input flags which control exactly what components to draw.
*
* @param healthbar
* @param hp The battler's current HP
* @param flags The components to be drawn, as a bitmask.
*/
void Healthbar_DrawInfo(Healthbar *healthbar, u32 hp, u32 flags);
void ov16_02267220(Healthbar * param0);
void ov16_02267258(Healthbar * param0);
void ov16_022672C4(Healthbar * param0);
void ov16_02267360(Healthbar * param0);
void ov16_0226737C(Healthbar * param0);

/**
* @brief Compute the battler's new HP after taking a given amount of
* damage or restoring a certain amount of health. Additionally, cache
* this difference, flooring it to the bounds of the battler's current
* and maximum HP.
*
* @param healthbar
* @param damage The amount of damage dealt to a battler. Negative
* values are damage, positive values are recovery.
*/
void Healthbar_CalcHP(Healthbar *healthbar, int damage);
s32 ov16_022674F8(Healthbar * param0);
void Healthbar_CalcExp(Healthbar * param0, int param1);
s32 ov16_02267560(Healthbar * param0);
void ov16_0226757C(Healthbar * param0);
void ov16_022675AC(Healthbar * param0);
void ov16_022675D8(Healthbar * param0, int param1);

/**
* @brief Enable (or disable) the healthbar.
*
* @param battleSys
* @param enable If TRUE, enable the healthbar; otherwise, disable it.
*/
void Healthbar_Enable(Healthbar *battleSys, BOOL enable);

/**
* @brief Offset the healthbar's position by a given value along the X and Y axes.
*
* @param healthbar
* @param x X-axis offset for the healthbar from its current position.
* @param y Y-axis offset for the healthbar from its current position.
*/
void Healthbar_OffsetPositionXY(Healthbar *healthbar, int x, int y);

/**
* @brief Scroll the healthbar in or out.
*
* @param healthbar
* @param direction The direction to scroll the healthbar.
*/
void Healthbar_Scroll(Healthbar *healthbar, enum HealthbarScrollDirection direction);

/**
* @brief Determine the type of healthbar to be displayed for a given battler type
* (solo player, solo enemy, or any slot in doubles) and battle type.
*
* Pal Park and Safari Zone use a different healthbar type than normal battles.
*
* @param battlerType The type of battler which the healthbar represents.
* @param battleType The type of battle in which the healthbar will be used.
* @return The resulting healthbar type; see enum HealthbarType.
*/
u8 Healthbar_Type(int battlerType, u32 battleType);
void ov16_0226834C(Healthbar * param0, u8 * param1);
void ov16_02268468(Healthbar * param0);
void ov16_0226846C(Healthbar * param0);
void ov16_02268470(Healthbar * param0);
void ov16_02268498(Healthbar * param0);

#endif // POKEPLATINUM_OV16_02266F1C_H
3 changes: 3 additions & 0 deletions include/constants/battle/battle_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
#define POKEPLATINUM_CONSTANTS_BATTLE_BATTLE_IO_H

enum BattleIOCommand {
BTLIOCMD_SLIDE_HEALTHBAR_IN = 12,
BTLIOCMD_SLIDE_HEALTHBAR_OUT,

BTLIOCMD_PRINT_MESSAGE = 21,

BTLIOCMD_SHOW_BATTLE_START_PARTY_GAUGE = 48,
Expand Down
26 changes: 26 additions & 0 deletions include/constants/font.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#ifndef POKEPLATINUM_CONSTANTS_FONT_H
#define POKEPLATINUM_CONSTANTS_FONT_H

typedef u32 FONT_COLOR;

#define FONT_COLOR_MASK 0xFF
#define FONT_COLOR_LETTER_SHIFT 16
#define FONT_COLOR_SHADOW_SHIFT 8
#define FONT_COLOR_BG_SHIFT 0

#define MAKE_FONT_COLOR(letter, shadow, bg) ((FONT_COLOR)( \
((letter & FONT_COLOR_MASK) << FONT_COLOR_LETTER_SHIFT) \
| ((shadow & FONT_COLOR_MASK) << FONT_COLOR_SHADOW_SHIFT) \
| ((bg & FONT_COLOR_MASK) << FONT_COLOR_BG_SHIFT) \
))

enum FontType {
FONT_SYSTEM = 0,
FONT_NPC_TALK,
FONT_BUTTONS,
FONT_UNK,

FONT_MAX,
};

#endif // POKEPLATINUM_CONSTANTS_FONT_H
2 changes: 1 addition & 1 deletion include/overlay005/ov5_021DB888.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "struct_decls/struct_020508D4_decl.h"
#include "struct_decls/struct_02061AB4_decl.h"

void ov5_021DB888(UnkStruct_020508D4 * param0, UnkStruct_0200B358 * param1, u16 * param2);
void ov5_021DB888(UnkStruct_020508D4 * param0, StringFormatter * param1, u16 * param2);
BOOL ov5_021DBB94(UnkStruct_0203CDB0 * param0);
u16 ov5_021DBD98(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1, u16 param2);
void ov5_021DBED4(UnkStruct_0203CDB0 * param0, UnkStruct_02061AB4 * param1);
Expand Down
8 changes: 4 additions & 4 deletions include/overlay005/ov5_021DC018.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
#include "struct_defs/struct_0205AA50.h"
#include "overlay005/struct_ov5_021DC1A4_decl.h"

UnkStruct_ov5_021DC1A4 * ov5_021DC150(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, Window * param7, MessageLoader * param8);
UnkStruct_ov5_021DC1A4 * ov5_021DC150(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8);
void ov5_021DC1A4(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2);
void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 * param0);
void ov5_021DC424(UnkStruct_ov5_021DC1A4 * param0);
UnkStruct_ov5_021DC1A4 * ov5_021DC48C(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, Window * param7, MessageLoader * param8);
UnkStruct_ov5_021DC1A4 * ov5_021DC48C(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringFormatter * param6, Window * param7, MessageLoader * param8);
void ov5_021DC4B0(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2, u32 param3);
void ov5_021DC4B8(UnkStruct_ov5_021DC1A4 * param0);
void ov5_021DC528(UnkStruct_ov5_021DC1A4 * param0, u16 param1);
void ov5_021DC600(UnkStruct_ov5_021DC1A4 * param0, u16 * param1, u16 * param2);
void ov5_021DCB24(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 * param3, UnkStruct_0200B358 * param4, u16 param5);
void ov5_021DCB24(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 * param3, StringFormatter * param4, u16 param5);
u16 ov5_021DCCC8(int param0);
void ov5_021DCD94(UnkStruct_ov5_021DC1A4 * param0, u8 param1);
Window * ov5_021DCEB0(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2);
Expand All @@ -27,7 +27,7 @@ void ov5_021DD084(Window * param0);
void ov5_021DD098(UnkStruct_0203CDB0 * param0, Window * param1);
Window * ov5_021DD140(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2);
void ov5_021DD1A4(UnkStruct_0203CDB0 * param0, Window * param1);
UnkStruct_ov5_021DC1A4 * ov5_021DD250(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 * param3, UnkStruct_0200B358 * param4, u8 param5, u8 param6, u8 param7, u8 param8);
UnkStruct_ov5_021DC1A4 * ov5_021DD250(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 * param3, StringFormatter * param4, u8 param5, u8 param6, u8 param7, u8 param8);
void ov5_021DD3A8(UnkStruct_ov5_021DC1A4 * param0);
void ov5_021DD3F4(UnkStruct_ov5_021DC1A4 * param0, BOOL param1);
void ov5_021DD410(UnkStruct_ov5_021DC1A4 * param0, BOOL param1);
Expand Down
2 changes: 1 addition & 1 deletion include/overlay005/ov5_021DD42C.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ void ov5_021DD42C(UnkStruct_ov5_021DD42C * param0, UnkStruct_0203E724 * param1);
void ov5_021DD444(UnkStruct_0203E724 * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4);
void ov5_021DD498(UnkStruct_0203E724 * param0, const MessageLoader * param1, int param2);
void ov5_021DD4CC(UnkStruct_0203E724 * param0, u16 param1, u16 param2, u16 param3, s16 param4, u8 param5);
void ov5_021DD530(UnkStruct_0203E724 * param0, UnkStruct_0200B358 * param1, u8 param2, u8 param3);
void ov5_021DD530(UnkStruct_0203E724 * param0, StringFormatter * param1, u8 param2, u8 param3);

#endif // POKEPLATINUM_OV5_021DD42C_H
16 changes: 8 additions & 8 deletions include/overlay005/ov5_021E622C.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@
u8 ov5_021E6238(UnkStruct_02026310 * param0);
int ov5_021E6270(UnkStruct_02026310 * param0);
void ov5_021E6358(Party * param0, int param1, UnkStruct_02026310 * param2, SaveData * param3);
u16 ov5_021E64F8(Party * param0, UnkStruct_0200B358 * param1, UnkStruct_02026310 * param2, u8 param3);
u16 ov5_021E64F8(Party * param0, StringFormatter * param1, UnkStruct_02026310 * param2, u8 param3);
int ov5_021E6520(BoxPokemon * param0, u32 param1);
int ov5_021E6568(UnkStruct_02026218 * param0);
int ov5_021E6590(UnkStruct_02026218 * param0);
u8 ov5_021E65B0(UnkStruct_02026218 * param0, UnkStruct_0200B358 * param1);
int ov5_021E65EC(UnkStruct_02026218 * param0, UnkStruct_0200B358 * param1);
int ov5_021E6630(UnkStruct_02026310 * param0, u8 param1, UnkStruct_0200B358 * param2);
u8 ov5_021E6640(UnkStruct_02026310 * param0, int param1, UnkStruct_0200B358 * param2);
u8 ov5_021E65B0(UnkStruct_02026218 * param0, StringFormatter * param1);
int ov5_021E65EC(UnkStruct_02026218 * param0, StringFormatter * param1);
int ov5_021E6630(UnkStruct_02026310 * param0, u8 param1, StringFormatter * param2);
u8 ov5_021E6640(UnkStruct_02026310 * param0, int param1, StringFormatter * param2);
void ov5_021E6720(UnkStruct_02026310 * param0);
void ov5_021E6B40(UnkStruct_02026310 * param0);
void ov5_021E6CF0(Pokemon * param0, u16 param1, u8 param2, TrainerInfo * param3, int param4, int param5);
void ov5_021E6DE8(Pokemon * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4);
void ov5_021E6EA8(UnkStruct_02026310 * param0, Party * param1, TrainerInfo * param2);
BOOL ov5_021E7154(UnkStruct_02026310 * param0, Party * param1, UnkStruct_0203CDB0 * param2);
Pokemon * ov5_021E7278(Party * param0);
void ov5_021E72BC(UnkStruct_02026310 * param0, UnkStruct_0200B358 * param1);
void ov5_021E7308(UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 param3, u8 param4, UnkStruct_0200B358 * param5);
u16 ov5_021E73A0(Party * param0, int param1, UnkStruct_0200B358 * param2);
void ov5_021E72BC(UnkStruct_02026310 * param0, StringFormatter * param1);
void ov5_021E7308(UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 param3, u8 param4, StringFormatter * param5);
u16 ov5_021E73A0(Party * param0, int param1, StringFormatter * param2);
u8 ov5_021E73C8(UnkStruct_02026310 * param0);
u8 ov5_021E73F0(u32 param0);
u32 ov5_021E7420(UnkStruct_02026310 * param0);
Expand Down
2 changes: 1 addition & 1 deletion include/overlay006/ov6_022465FC.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ int ov6_0224660C(UnkStruct_0203CDB0 * param0);
int ov6_022468B0(UnkStruct_0203CDB0 * param0, BOOL param1, BOOL param2);
int ov6_02246920(UnkStruct_0203CDB0 * param0);
int ov6_02246978(UnkStruct_0203CDB0 * param0, int param1);
BOOL ov6_022469E0(UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param1, int param2, u16 * param3, u16 * param4);
BOOL ov6_022469E0(UnkStruct_0203CDB0 * param0, StringFormatter * param1, int param2, u16 * param3, u16 * param4);

#endif // POKEPLATINUM_OV6_022465FC_H
2 changes: 1 addition & 1 deletion include/overlay007/struct_ov7_0224D008.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ typedef struct {
UIControlData * unk_80;
ResourceMetadata * unk_84;
MessageLoader * unk_88;
UnkStruct_0200B358 * unk_8C;
StringFormatter * unk_8C;
UnkStruct_020203AC * unk_90;
UnkStruct_ov5_021D30A8 unk_94;
GraphicElementData * unk_25C[4];
Expand Down
2 changes: 1 addition & 1 deletion include/overlay013/struct_ov13_022213F0.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ typedef struct {
u8 unk_1F9F_7 : 1;
UnkStruct_0200C440 * unk_1FA0;
MessageLoader * unk_1FA4;
UnkStruct_0200B358 * unk_1FA8;
StringFormatter * unk_1FA8;
Strbuf* unk_1FAC;
SpriteGfxHandler * unk_1FB0;
CellActorData * unk_1FB4[38];
Expand Down
2 changes: 1 addition & 1 deletion include/overlay013/struct_ov13_02227244.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ typedef struct {
PaletteData * unk_08;
UnkStruct_0200C440 * unk_0C;
MessageLoader * unk_10;
UnkStruct_0200B358 * unk_14;
StringFormatter * unk_14;
Strbuf* unk_18;
Window unk_1C;
Window * unk_2C;
Expand Down
2 changes: 1 addition & 1 deletion include/overlay016/ov16_0223DF00.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ u16 * ov16_0223E0A4(BattleSystem * param0);
u16 * ov16_0223E0B0(BattleSystem * param0);
u16 * ov16_0223E0BC(BattleSystem * param0);
UnkStruct_ov16_0223E0C8 * ov16_0223E0C8(BattleSystem * param0);
UnkStruct_0200B358 * ov16_0223E0D0(BattleSystem * param0);
StringFormatter * BattleSystem_StringFormatter(BattleSystem * param0);
Strbuf* ov16_0223E0D4(BattleSystem * param0);

/**
Expand Down
Loading
Loading