From dd24597d529cd5d9c06aa4699526dbe13d7c9b8e Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 4 Apr 2019 21:24:21 +0200
Subject: Finish up menu specialised

---
 include/battle.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'include/battle.h')

diff --git a/include/battle.h b/include/battle.h
index 13c1851cf..0274e4d9f 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -276,12 +276,7 @@ struct BattleCallbacksStack
 
 struct StatsArray
 {
-    u16 hp;
-    u16 atk;
-    u16 def;
-    u16 spd;
-    u16 spAtk;
-    u16 spDef;
+    u16 stats[NUM_STATS];
 };
 
 struct BattleResources
@@ -290,7 +285,7 @@ struct BattleResources
     struct UnknownFlags *flags;
     struct BattleScriptsStack* battleScriptsStack;
     struct BattleCallbacksStack* battleCallbackStack;
-    struct StatsArray* statsBeforeLvlUp;
+    struct StatsArray* beforeLvlUp;
     struct AI_ThinkingStruct *ai;
     struct BattleHistory *battleHistory;
     struct BattleScriptsStack *AI_ScriptsStack;
-- 
cgit v1.2.3


From b0223f691fcc83c18b6ba8df5140d907939b04cf Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 4 Apr 2019 23:53:06 +0200
Subject: Clean up data headers

---
 include/battle.h | 65 +++-----------------------------------------------------
 1 file changed, 3 insertions(+), 62 deletions(-)

(limited to 'include/battle.h')

diff --git a/include/battle.h b/include/battle.h
index 0274e4d9f..e3c37aa99 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -62,70 +62,12 @@
 
 #define BATTLE_BUFFER_LINK_SIZE 0x1000
 
-struct TrainerMonNoItemDefaultMoves
-{
-    u16 iv;
-    u8 lvl;
-    u16 species;
-};
-
-struct TrainerMonItemDefaultMoves
-{
-    u16 iv;
-    u8 lvl;
-    u16 species;
-    u16 heldItem;
-};
-
-struct TrainerMonNoItemCustomMoves
-{
-    u16 iv;
-    u8 lvl;
-    u16 species;
-    u16 moves[4];
-};
-
-struct TrainerMonItemCustomMoves
-{
-    u16 iv;
-    u8 lvl;
-    u16 species;
-    u16 heldItem;
-    u16 moves[4];
-};
-
-union TrainerMonPtr
-{
-    const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
-    const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
-    const struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
-    const struct TrainerMonItemCustomMoves *ItemCustomMoves;
-};
-
-struct Trainer
-{
-    /*0x00*/ u8 partyFlags;
-    /*0x01*/ u8 trainerClass;
-    /*0x02*/ u8 encounterMusic_gender; // last bit is gender
-    /*0x03*/ u8 trainerPic;
-    /*0x04*/ u8 trainerName[12];
-    /*0x10*/ u16 items[4];
-    /*0x18*/ bool8 doubleBattle;
-    /*0x1C*/ u32 aiFlags;
-    /*0x20*/ u8 partySize;
-    /*0x24*/ union TrainerMonPtr party;
-};
-
-extern const struct Trainer gTrainers[];
-
-#define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F))
-
-struct UnknownFlags
+struct ResourceFlags
 {
     u32 flags[4];
 };
 
-#define UNKNOWN_FLAG_FLASH_FIRE 1
+#define RESOURCE_FLAG_FLASH_FIRE 1
 
 struct DisableStruct
 {
@@ -282,7 +224,7 @@ struct StatsArray
 struct BattleResources
 {
     struct SecretBaseRecord* secretBase;
-    struct UnknownFlags *flags;
+    struct ResourceFlags *flags;
     struct BattleScriptsStack* battleScriptsStack;
     struct BattleCallbacksStack* battleCallbackStack;
     struct StatsArray* beforeLvlUp;
@@ -769,6 +711,5 @@ extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gMultiUsePlayerCursor;
 extern u8 gNumberOfMovesToChoose;
 extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern const u8 gTrainerClassNames[][13];
 
 #endif // GUARD_BATTLE_H
-- 
cgit v1.2.3


From 033580da9623d6519c35efcb3594552d3389772d Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Fri, 5 Apr 2019 16:11:24 -0500
Subject: Document secret base

---
 include/battle.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/battle.h')

diff --git a/include/battle.h b/include/battle.h
index e3c37aa99..0f4087c90 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -223,7 +223,7 @@ struct StatsArray
 
 struct BattleResources
 {
-    struct SecretBaseRecord* secretBase;
+    struct SecretBase* secretBase;
     struct ResourceFlags *flags;
     struct BattleScriptsStack* battleScriptsStack;
     struct BattleCallbacksStack* battleCallbackStack;
-- 
cgit v1.2.3