From 72f0a079a9221e314e7eecf0e920313bf83d32ac Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 19 Nov 2018 09:28:55 -0600 Subject: Decompile all of battle_anim_utility_funcs --- include/battle.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'include/battle.h') diff --git a/include/battle.h b/include/battle.h index 90bef24ac..70b1856a8 100644 --- a/include/battle.h +++ b/include/battle.h @@ -660,7 +660,7 @@ struct MonSpritesGfx u8 field_F4[0x80]; u8 *barFontGfx; void *field_178; - void *field_17C; + u16 *field_17C; }; // All battle variables are declared in battle_main.c @@ -769,4 +769,17 @@ extern u8 gMultiUsePlayerCursor; extern u8 gNumberOfMovesToChoose; extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; +extern u16 gBattle_WIN0H; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN1H; +extern u16 gBattle_WIN1V; +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; + #endif // GUARD_BATTLE_H -- cgit v1.2.3 From 37d49b34e0fafcbe6bd62f9f549efb656837ff31 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 19 Nov 2018 17:36:39 +0100 Subject: Move vars to battle_main.c --- include/battle.h | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'include/battle.h') diff --git a/include/battle.h b/include/battle.h index 70b1856a8..c4a0fe9a5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -664,6 +664,18 @@ struct MonSpritesGfx }; // All battle variables are declared in battle_main.c +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[300]; extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT]; extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; @@ -769,17 +781,4 @@ extern u8 gMultiUsePlayerCursor; extern u8 gNumberOfMovesToChoose; extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; -extern u16 gBattle_WIN0H; -extern u16 gBattle_WIN0V; -extern u16 gBattle_WIN1H; -extern u16 gBattle_WIN1V; -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; - #endif // GUARD_BATTLE_H -- cgit v1.2.3