From 95a64284fdc2b063a49f1ad3edb8726ec0db0366 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Dec 2017 17:18:25 -0600 Subject: decompile nullsub_89 - sub_80AB9A0 --- include/battle_anim.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/battle_anim.h') diff --git a/include/battle_anim.h b/include/battle_anim.h index 9598c5e5f..f3d8f5a0a 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -4,8 +4,10 @@ #include "sprite.h" #define REG_BGnCNT_BITFIELD(n) (*(struct BGCntrlBitfield *)REG_ADDR_BG##n##CNT) +#define REG_BG0CNT_BITFIELD REG_BGnCNT_BITFIELD(0) #define REG_BG1CNT_BITFIELD REG_BGnCNT_BITFIELD(1) #define REG_BG2CNT_BITFIELD REG_BGnCNT_BITFIELD(2) +#define REG_BG3CNT_BITFIELD REG_BGnCNT_BITFIELD(3) struct BGCntrlBitfield { -- cgit v1.2.3 From 75f4026767b9b99c855ee62023ba91db61c0e4c9 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 14 Dec 2017 21:12:42 -0600 Subject: decompile about half of sub_80AC2CC --- include/battle_anim.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/battle_anim.h') diff --git a/include/battle_anim.h b/include/battle_anim.h index f3d8f5a0a..77f7aed21 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -44,6 +44,10 @@ struct UnknownStruct3 u8 filler1[0xB]; }; +extern void (*gAnimScriptCallback)(void); +extern u8 gAnimScriptActive; + +void ExecuteMoveAnim(u16 move); void DoMoveAnim(const u8 *const moveAnims[], u16 b, u8 c); bool8 IsAnimBankSpriteVisible(u8 a); void sub_8076034(u8, u8); -- cgit v1.2.3 From 71d3e605290b2069d3571478a3736b04d658decb Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 22 Dec 2017 00:22:48 -0600 Subject: save work --- include/battle_anim.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'include/battle_anim.h') diff --git a/include/battle_anim.h b/include/battle_anim.h index 77f7aed21..9decb8f95 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -3,22 +3,12 @@ #include "sprite.h" -#define REG_BGnCNT_BITFIELD(n) (*(struct BGCntrlBitfield *)REG_ADDR_BG##n##CNT) +#define REG_BGnCNT_BITFIELD(n) (*(vBgCnt *)REG_ADDR_BG##n##CNT) #define REG_BG0CNT_BITFIELD REG_BGnCNT_BITFIELD(0) #define REG_BG1CNT_BITFIELD REG_BGnCNT_BITFIELD(1) #define REG_BG2CNT_BITFIELD REG_BGnCNT_BITFIELD(2) #define REG_BG3CNT_BITFIELD REG_BGnCNT_BITFIELD(3) -struct BGCntrlBitfield -{ - volatile u16 priority:2; - volatile u16 charBaseBlock:2; - volatile u16 field_0_2:4; - volatile u16 field_1_0:5; - volatile u16 areaOverflowMode:1; - volatile u16 screenSize:2; -}; - struct BattleAnimBackground { void *image; @@ -46,6 +36,8 @@ struct UnknownStruct3 extern void (*gAnimScriptCallback)(void); extern u8 gAnimScriptActive; +extern u8 gHappinessMoveAnim; +extern u8 gUnknown_0202F7C4; void ExecuteMoveAnim(u16 move); void DoMoveAnim(const u8 *const moveAnims[], u16 b, u8 c); -- cgit v1.2.3