From 904bba9e16f99bc7a306b6705948cbfe14e41786 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 4 Sep 2019 15:11:57 -0400
Subject: NULL_BATTLE_TOWER_POKEMON define

---
 include/global.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/global.h')

diff --git a/include/global.h b/include/global.h
index a82fe5861..1fbc70e23 100644
--- a/include/global.h
+++ b/include/global.h
@@ -257,6 +257,8 @@ struct BattleTowerPokemon
     u8 friendship;
 };
 
+#define NULL_BATTLE_TOWER_POKEMON { .nickname = __("$$$$$$$$$$$") }
+
 struct EmeraldBattleTowerRecord
 {
     /*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100
-- 
cgit v1.2.3


From 85d97542cdb269278aad3cc3735c29845f9d8738 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Sun, 8 Sep 2019 11:53:48 -0400
Subject: Use MAX_MON_MOVES constants

---
 include/global.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/global.h')

diff --git a/include/global.h b/include/global.h
index 1fbc70e23..fa8fe8eb3 100644
--- a/include/global.h
+++ b/include/global.h
@@ -212,7 +212,7 @@ struct BerryCrush
 struct ApprenticeMon
 {
     u16 species;
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
     u16 item;
 };
 
@@ -234,7 +234,7 @@ struct BattleTowerPokemon
 {
     u16 species;
     u16 heldItem;
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
     u8 level;
     u8 ppBonuses;
     u8 hpEV;
@@ -290,7 +290,7 @@ struct BattleTowerEReaderTrainer
 
 struct FrontierMonData
 {
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
     u8 evs[6];
     u8 nature;
 };
@@ -946,7 +946,7 @@ struct SaveBlock1
     /*0x2B94*/ u8 outbreakPokemonLevel;
     /*0x2B95*/ u8 outbreakUnk1;
     /*0x2B96*/ u16 outbreakUnk2;
-    /*0x2B98*/ u16 outbreakPokemonMoves[4];
+    /*0x2B98*/ u16 outbreakPokemonMoves[MAX_MON_MOVES];
     /*0x2BA0*/ u8 outbreakUnk4;
     /*0x2BA1*/ u8 outbreakPokemonProbability;
     /*0x2BA2*/ u16 outbreakDaysLeft;
-- 
cgit v1.2.3