From 2f99edc6fd21d0af1bb05fae55302a46c744ffa6 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Fri, 3 Nov 2017 02:43:41 -0400
Subject: NotInBattle

---
 include/battle_anim.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include/battle_anim.h')

diff --git a/include/battle_anim.h b/include/battle_anim.h
index 2386c515c..a9405068d 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -55,13 +55,12 @@ struct UnknownStruct3
 void DoMoveAnim(const u8 *const moveAnims[], u16 b, u8 c);
 bool8 IsAnimBankSpriteVisible(u8 a);
 void sub_8076034(u8, u8);
-bool8 IsContest(void);
+bool8 NotInBattle(void);
 void battle_anim_clear_some_data(void);
 void move_anim_8072740(struct Sprite *sprite);
 void DestroyAnimVisualTask(u8 task);
 void DestroyAnimVisualTask(u8 task);
 bool8 IsAnimBankSpriteVisible(u8);
-u8 IsContest();
 
 
 #endif
-- 
cgit v1.2.3


From 67ea254871134d850e013ee72bd4275b40e8091b Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Fri, 3 Nov 2017 19:09:40 -0400
Subject: BG_CHAR_ADDR and BG_SCREEN_ADDR recast fixes

---
 include/battle_anim.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'include/battle_anim.h')

diff --git a/include/battle_anim.h b/include/battle_anim.h
index a9405068d..3db5ae967 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -3,10 +3,6 @@
 
 #include "sprite.h"
 
-#define SCRIPT_READ_8(ptr)  ((ptr)[0])
-#define SCRIPT_READ_16(ptr) ((ptr)[0] | ((ptr)[1] << 8))
-#define SCRIPT_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24))
-
 #define REG_BGnCNT_BITFIELD(n) (*(struct BGCntrlBitfield *)REG_ADDR_BG##n##CNT)
 #define REG_BG1CNT_BITFIELD REG_BGnCNT_BITFIELD(1)
 #define REG_BG2CNT_BITFIELD REG_BGnCNT_BITFIELD(2)
-- 
cgit v1.2.3