Skip to content

Document BattleSystem struct and battle_system.c #930

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.

Sign up for GitHub

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

Open
Viperio19 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Document BattleSystem struct and battle_system.c #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion include/battle/battle_display.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void ov16_02263730(BattleSystem *battleSys, BattlerData *param1);
u8 Battler_Type(BattlerData *param0);
u8 Battler_BootState(BattlerData *param0);
PokemonSprite *ov16_02263AFC(BattlerData *param0);
Healthbar *ov16_02263B08(BattlerData *param0);
Healthbar *BattlerData_GetHealthbar(BattlerData *param0);
UnkStruct_ov16_0226C378 *ov16_02263B0C(BattlerData *param0);
void ov16_02263B10(BattlerData *param0);
void ov16_02263B20(BattlerData *param0, int param1);
Expand Down
2 changes: 1 addition & 1 deletion include/battle/battle_lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ void BattleSystem_DecPPForPressure(BattleContext *battleCtx, int attacker, int d
* @param battleCtx
* @return TRUE if the recording has stopped, FALSE otherwise.
*/
BOOL Battle_RecordingStopped(BattleSystem *battleSys, BattleContext *battleCtx);
BOOL BattleSystem_IsRecordingStopped(BattleSystem *battleSys, BattleContext *battleCtx);

/**
* @brief Get an accessible field from the BattleContext struct.
Expand Down
178 changes: 89 additions & 89 deletions include/battle/ov16_0223DF00.h → include/battle/battle_system.h
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225CBB8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "battle_anim/struct_ov12_02238004_decl.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
UnkStruct_ov12_02237F98 *unk_04;
UnkStruct_ov12_02238004 *unk_08[3];
u8 unk_14;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225D1C4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "pokemon_sprite.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
PokemonSprite *unk_04;
u8 unk_08;
u8 unk_09;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225D360.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "battle/struct_ov16_0225BFFC_decl.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlerData *unk_04;
u8 unk_08;
u8 unk_09;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225D3CC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "battle/struct_ov16_0225BFFC_decl.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlerData *unk_04;
u8 unk_08;
u8 unk_09;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225D5B8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "struct_decls/battle_system.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
void *unk_04;
u8 unk_08;
u8 unk_09;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225D698.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "struct_decls/battle_system.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
void *unk_04;
int unk_08;
u16 unk_0C[4];
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225D708.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "battle/struct_ov16_0225C29C_sub1.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
void *unk_04;
int unk_08;
u8 unk_0C;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225D794.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "battle_sub_menus/battle_bag.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattleBagContext *unk_04;
UnkStruct_ov16_0225D840 *unk_08;
u8 unk_0C;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225D840.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "battle_sub_menus/battle_party.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlePartyContext *unk_04;
u8 unk_08;
u8 unk_09;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225D8AC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "struct_decls/battle_system.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
void *unk_04;
int unk_08;
u8 unk_0C;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225D9A8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "pokemon_sprite.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlerData *unk_04;
PokemonSprite *unk_08;
BattleAnimSystem *unk_0C;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225DA44.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "pokemon_sprite.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
PokemonSprite *unk_04;
u8 unk_08;
u8 unk_09;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225DB74.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "pokemon_sprite.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlerData *unk_04;
PokemonSprite *unk_08;
MoveAnimation unk_0C;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225DC7C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "struct_decls/battle_system.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
u8 unk_04;
u8 unk_05;
u8 unk_06;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225DCB0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "battle/struct_ov16_02265BBC.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlerData *unk_04;
MoveAnimation unk_08;
u8 unk_60;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225DF34.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "struct_decls/battle_system.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
void *unk_04;
u8 unk_08;
u8 unk_09;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225DF6C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "struct_decls/battle_system.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
u8 unk_04;
u8 unk_05;
u8 unk_06;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225E0BC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "battle_sub_menus/battle_party.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlePartyContext *unk_04;
u8 unk_08;
u8 unk_09;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225E0F4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "pokemon_sprite.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
PokemonSprite *unk_04;
u8 unk_08;
u8 unk_09;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225E2C8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "pokemon_sprite.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlerData *unk_04;
PokemonSprite *unk_08;
u8 unk_0C;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225E300.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "pokemon_sprite.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlerData *unk_04;
PokemonSprite *unk_08;
u8 unk_0C;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225E4E8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "pokemon_sprite.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlerData *unk_04;
PokemonSprite *unk_08;
UnkStruct_ov16_02268520 *unk_0C;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225EA80.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "battle_anim/struct_ov12_02235FE0_decl.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlerData *unk_04;
UnkStruct_ov12_02235FE0 *unk_08;
BallRotation *unk_0C;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_0225F764.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "pokemon_sprite.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
BattlerData *unk_04;
PokemonSprite *unk_08;
BallRotation *unk_0C;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_02260384.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "sprite_system.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
ManagedSprite *unk_04;
u8 unk_08;
u8 unk_09;
Expand Down
2 changes: 1 addition & 1 deletion include/battle/struct_ov16_02264650_1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "sprite_system.h"

typedef struct {
BattleSystem *unk_00;
BattleSystem *battleSys;
UnkStruct_ov16_02268520 *unk_04;
ManagedSprite *unk_08;
u8 unk_0C;
Expand Down
2 changes: 1 addition & 1 deletion include/battle_sub_menus/battle_bag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ enum BattleBagUseItemScreenButton {
#define MENU_POCKET_ICON_SIZE_TILES (MENU_POCKET_ICON_WIDTH_TILES * MENU_POCKET_ICON_HEIGHT_TILES)

typedef struct BattleBagContext {
BattleSystem *battleSystem;
BattleSystem *battleSys;
TrainerInfo *trainerInfo;
Bag *bag;
enum HeapID heapID;
Expand Down
2 changes: 1 addition & 1 deletion include/battle_sub_menus/battle_party.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ typedef struct BattlePartyPokemon {
typedef struct BattlePartyContext {
Party *party;
void *unused1;
BattleSystem *battleSystem;
BattleSystem *battleSys;
enum HeapID heapID;
u8 unused2;
u8 selectedPartyIndex;
Expand Down
1 change: 1 addition & 0 deletions include/math_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#define LCRNG_MULTIPLIER 1103515245L
#define LCRNG_INCREMENT 24691
#define LCRNG_DIVISOR 65536L

// Does almost the same as FX_DEG_TO_IDX but takes integers as input instead of fx32
// Use if FX_DEG_TO_IDX(FX32_CONST(degrees)) doesn't match
Expand Down
Loading