summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h2
-rw-r--r--include/battle_tower.h4
-rw-r--r--include/constants/battle_tower.h7
-rw-r--r--include/party_menu.h1
-rw-r--r--include/script_pokemon_util_80A0058.h1
5 files changed, 12 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h
index 40a2eba04..122ccc894 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -432,7 +432,7 @@ struct BattleStruct
u16 changedItems[MAX_BATTLERS_COUNT];
u8 intimidateBattler;
u8 switchInItemsCounter;
- u8 arenaTurnCounter; // not used in FR?
+ u8 field_DA; // battle tower related
u8 turnSideTracker;
u8 fillerDC[0xDF-0xDC];
u8 givenExpMons;
diff --git a/include/battle_tower.h b/include/battle_tower.h
index b7b106107..9bb93f1c2 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -12,7 +12,7 @@ struct BattleTowerTrainer
u8 trainerClass;
u8 name[3];
u8 teamFlags;
- u16 speech[6];
+ u16 greeting[6];
};
struct BattleTowerPokemonTemplate
@@ -26,7 +26,7 @@ struct BattleTowerPokemonTemplate
};
u16 sub_8164FCC(u8, u8);
-void sub_80E7524(struct BattleTowerEReaderTrainer *);
+void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *);
void ValidateEReaderTrainer(void);
u8 GetBattleTowerTrainerFrontSpriteId(void);
u8 GetEreaderTrainerFrontSpriteId(void);
diff --git a/include/constants/battle_tower.h b/include/constants/battle_tower.h
index b0080caff..6e37d15ec 100644
--- a/include/constants/battle_tower.h
+++ b/include/constants/battle_tower.h
@@ -72,4 +72,11 @@
#define BATTLE_TOWER_ITEM_LUCKY_PUNCH 61
#define BATTLE_TOWER_ITEM_GANLON_BERRY 62
+#define BTSPECIAL_TEST 0
+#define BTSPECIAL_RESULT_SAVE_SCUM 1
+#define BTSPECIAL_RESULT_WON7 2
+#define BTSPECIAL_RESULT_LOST 3
+#define BTSPECIAL_RESULT_QUICKSAVE 4
+#define BTSPECIAL_RESULT_INACTIVE 5
+
#endif //GUARD_CONSTANTS_BATTLE_TOWER_H
diff --git a/include/party_menu.h b/include/party_menu.h
index c07371a5d..6c81a248c 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -45,6 +45,7 @@ extern u8 gUnknown_203B0C0;
extern u8 gUnknown_203B0C1;
extern u8 gUnknown_203B0DC[3];
extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func);
+extern u8 gSelectedOrderFromParty[3];
bool8 FieldCallback_PrepareFadeInFromMenu(void);
bool8 MonKnowsMove(struct Pokemon *, u16);
diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util_80A0058.h
index 768e838dd..b63a7b0ef 100644
--- a/include/script_pokemon_util_80A0058.h
+++ b/include/script_pokemon_util_80A0058.h
@@ -5,5 +5,6 @@ bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3
bool8 ScriptGiveEgg(u16 species);
void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot);
void sp000_heal_pokemon(void);
+void ReducePlayerPartyToThree(void);
#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H