summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/battle_dome.h64
-rw-r--r--include/global.h21
-rw-r--r--include/strings.h116
3 files changed, 133 insertions, 68 deletions
diff --git a/include/constants/battle_dome.h b/include/constants/battle_dome.h
index 96542c596..46310c6ce 100644
--- a/include/constants/battle_dome.h
+++ b/include/constants/battle_dome.h
@@ -51,4 +51,68 @@
#define DOME_DATA_SELECTED_MONS 8
#define DOME_DATA_LAST_TOURNEY_TYPE 9
+//TODO:
+#define DOME_WINTEXT_NO_WINNER_YET 0
+#define DOME_WINTEXT_USED_MOVE 1
+#define DOME_WINTEXT_CHAMP 2
+#define DOME_WINTEXT_FORFEIT 3
+
+#define DOME_STATTEXT_GOOD_DOUBLE_STAT 0
+#define DOME_STATTEXT_GOOD_SINGLE_STAT 15
+#define DOME_STATTEXT_WELL_BALANCED 42
+
+// Move quality indexes, to determine Battle Dome trainers battle styles
+#define MOVE_QUALITY_COMBO 0 // Moves that work well in combination (e.g. Rain Dance + Hydro Pump)
+#define MOVE_QUALITY_STAT_RAISE 1
+#define MOVE_QUALITY_STAT_LOWER 2
+#define MOVE_QUALITY_RARE 3 // Uncommon moves. Mostly arbitrary
+#define MOVE_QUALITY_HEAL 4
+#define MOVE_QUALITY_RISKY 5
+#define MOVE_QUALITY_STATUS 6
+#define MOVE_QUALITY_DMG 7
+#define MOVE_QUALITY_DEF 8 // Defensive moves, like Amnesia, Light Screen, or accuracy-lowers
+#define MOVE_QUALITY_ACCURATE 9
+#define MOVE_QUALITY_POWERFUL 10 // Most of the moves that are >= 100 power
+#define MOVE_QUALITY_POPULAR 11 // Group seems arbitrary. All using it are TM/HMs, but its only 11/58
+#define MOVE_QUALITY_LUCK 12
+#define MOVE_QUALITY_STRONG 13 // Most of the moves that are >= 90 power
+#define MOVE_QUALITY_LOW_PP 14
+#define MOVE_QUALITY_EFFECT 15 // Moves with additional effects
+#define NUM_MOVE_QUALITIES 16
+
+#define DOME_BATTLE_STYLE_RISKY 0
+#define DOME_BATTLE_STYLE_STALL 1
+#define DOME_BATTLE_STYLE_VARIED 2
+#define DOME_BATTLE_STYLE_COMBO_HIGH 3
+#define DOME_BATTLE_STYLE_RARE_MOVES 4
+#define DOME_BATTLE_STYLE_RARE_MOVE 5
+#define DOME_BATTLE_STYLE_HP 6
+#define DOME_BATTLE_STYLE_STORE_POWER 7
+#define DOME_BATTLE_STYLE_ENFEEBLE_LOW 8
+#define DOME_BATTLE_STYLE_LUCK 9
+#define DOME_BATTLE_STYLE_10 10
+#define DOME_BATTLE_STYLE_LOW_PP 11
+#define DOME_BATTLE_STYLE_STATUS_ATK 12
+#define DOME_BATTLE_STYLE_ENDURE 13
+#define DOME_BATTLE_STYLE_STATUS 14
+#define DOME_BATTLE_STYLE_STRAIGHTFORWARD 15
+#define DOME_BATTLE_STYLE_AGGRESSIVE 16
+#define DOME_BATTLE_STYLE_DEF 17
+#define DOME_BATTLE_STYLE_ENFEEBLE_HIGH 18
+#define DOME_BATTLE_STYLE_POPULAR_POWER 19
+#define DOME_BATTLE_STYLE_COMBO_LOW 20
+#define DOME_BATTLE_STYLE_ACCURATE 21
+#define DOME_BATTLE_STYLE_POWERFUL 22
+#define DOME_BATTLE_STYLE_ATK_OVER_DEF 23
+#define DOME_BATTLE_STYLE_DEF_OVER_ATK 24
+#define DOME_BATTLE_STYLE_POPULAR_STRONG 25
+#define DOME_BATTLE_STYLE_EFFECTS 26
+#define DOME_BATTLE_STYLE_BALANCED 27
+#define DOME_BATTLE_STYLE_UNUSED1 28
+#define DOME_BATTLE_STYLE_UNUSED2 29
+#define DOME_BATTLE_STYLE_UNUSED3 30
+#define DOME_BATTLE_STYLE_UNUSED4 31
+#define NUM_BATTLE_STYLES 32
+
+
#endif //GUARD_CONSTANTS_BATTLE_DOME_H
diff --git a/include/global.h b/include/global.h
index 2b2860d64..ff288a41f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -297,7 +297,8 @@ struct BattleTowerEReaderTrainer
/*0xB8*/ u32 checksum;
};
-struct FrontierMonData
+// For displaying party information on the player's Battle Dome tourney page
+struct DomeMonData
{
u16 moves[MAX_MON_MOVES];
u8 evs[NUM_STATS];
@@ -388,7 +389,7 @@ struct BattleFrontier
/*0xE6A*/ u16 verdanturfTentPrize;
/*0xE6C*/ u16 fallarborTentPrize;
/*0xE6E*/ u16 slateportTentPrize;
- /*0xE70*/ struct RentalMon rentalMons[PARTY_SIZE];
+ /*0xE70*/ struct RentalMon rentalMons[FRONTIER_PARTY_SIZE * 2];
/*0xEB8*/ u16 battlePoints;
/*0xEBA*/ u16 cardBattlePoints;
/*0xEBC*/ u32 battlesCount;
@@ -400,7 +401,7 @@ struct BattleFrontier
/*0xEF9*/ u8 savedGame:1;
/*0xEFA*/ u8 unused_EFA;
/*0xEFB*/ u8 unused_EFB;
- /*0xEFC*/ struct FrontierMonData field_EFC[FRONTIER_PARTY_SIZE];
+ /*0xEFC*/ struct DomeMonData domePlayerPartyData[FRONTIER_PARTY_SIZE];
};
struct ApprenticeQuestion
@@ -930,13 +931,13 @@ struct SaveBlock1
/*0x271C*/ u8 playerRoomDecor[DECOR_MAX_PLAYERS_HOUSE];
/*0x2728*/ u8 playerRoomDecorPos[DECOR_MAX_PLAYERS_HOUSE];
/*0x2734*/ u8 decorDesk[10];
- /*0x????*/ u8 decorChair[10];
- /*0x????*/ u8 decorPlant[10];
- /*0x????*/ u8 decorOrnament[30];
- /*0x????*/ u8 decorMat[30];
- /*0x????*/ u8 decorPoster[10];
- /*0x????*/ u8 decorDoll[40];
- /*0x????*/ u8 decorCushion[10];
+ /*0x273E*/ u8 decorChair[10];
+ /*0x2748*/ u8 decorPlant[10];
+ /*0x2752*/ u8 decorOrnament[30];
+ /*0x2770*/ u8 decorMat[30];
+ /*0x278E*/ u8 decorPoster[10];
+ /*0x2798*/ u8 decorDoll[40];
+ /*0x27C0*/ u8 decorCushion[10];
/*0x27CA*/ u8 padding_27CA[2];
/*0x27CC*/ TVShow tvShows[TV_SHOWS_COUNT];
/*0x2B50*/ PokeNews pokeNews[POKE_NEWS_COUNT];
diff --git a/include/strings.h b/include/strings.h
index f8d77c73e..f3d9aed98 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1705,60 +1705,60 @@ extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[];
// Battle Dome.
-extern const u8 gBattleDomeOpponentPotentialText1[];
-extern const u8 gBattleDomeOpponentPotentialText2[];
-extern const u8 gBattleDomeOpponentPotentialText3[];
-extern const u8 gBattleDomeOpponentPotentialText4[];
-extern const u8 gBattleDomeOpponentPotentialText5[];
-extern const u8 gBattleDomeOpponentPotentialText6[];
-extern const u8 gBattleDomeOpponentPotentialText7[];
-extern const u8 gBattleDomeOpponentPotentialText8[];
-extern const u8 gBattleDomeOpponentPotentialText9[];
-extern const u8 gBattleDomeOpponentPotentialText10[];
-extern const u8 gBattleDomeOpponentPotentialText11[];
-extern const u8 gBattleDomeOpponentPotentialText12[];
-extern const u8 gBattleDomeOpponentPotentialText13[];
-extern const u8 gBattleDomeOpponentPotentialText14[];
-extern const u8 gBattleDomeOpponentPotentialText15[];
-extern const u8 gBattleDomeOpponentPotentialText16[];
-extern const u8 gBattleDomeOpponentPotentialText17[];
-extern const u8 gBattleDomeOpponentStyleText1[];
-extern const u8 gBattleDomeOpponentStyleText2[];
-extern const u8 gBattleDomeOpponentStyleText3[];
-extern const u8 gBattleDomeOpponentStyleText4[];
-extern const u8 gBattleDomeOpponentStyleText5[];
-extern const u8 gBattleDomeOpponentStyleText6[];
-extern const u8 gBattleDomeOpponentStyleText7[];
-extern const u8 gBattleDomeOpponentStyleText8[];
-extern const u8 gBattleDomeOpponentStyleText9[];
-extern const u8 gBattleDomeOpponentStyleText10[];
-extern const u8 gBattleDomeOpponentStyleText11[];
-extern const u8 gBattleDomeOpponentStyleText12[];
-extern const u8 gBattleDomeOpponentStyleText13[];
-extern const u8 gBattleDomeOpponentStyleText14[];
-extern const u8 gBattleDomeOpponentStyleText15[];
-extern const u8 gBattleDomeOpponentStyleText16[];
-extern const u8 gBattleDomeOpponentStyleText17[];
-extern const u8 gBattleDomeOpponentStyleText18[];
-extern const u8 gBattleDomeOpponentStyleText19[];
-extern const u8 gBattleDomeOpponentStyleText20[];
-extern const u8 gBattleDomeOpponentStyleText21[];
-extern const u8 gBattleDomeOpponentStyleText22[];
-extern const u8 gBattleDomeOpponentStyleText23[];
-extern const u8 gBattleDomeOpponentStyleText24[];
-extern const u8 gBattleDomeOpponentStyleText25[];
-extern const u8 gBattleDomeOpponentStyleText26[];
-extern const u8 gBattleDomeOpponentStyleText27[];
-extern const u8 gBattleDomeOpponentStyleText28[];
-extern const u8 gBattleDomeOpponentStyleTextUnused1[];
-extern const u8 gBattleDomeOpponentStyleTextUnused2[];
-extern const u8 gBattleDomeOpponentStyleTextUnused3[];
-extern const u8 gBattleDomeOpponentStyleTextUnused4[];
-extern const u8 gBattleDomeOpponentStatsText1[];
-extern const u8 gBattleDomeOpponentStatsText2[];
-extern const u8 gBattleDomeOpponentStatsText3[];
-extern const u8 gBattleDomeOpponentStatsText4[];
-extern const u8 gBattleDomeOpponentStatsText5[];
+extern const u8 BattleDome_Text_Potential1[];
+extern const u8 BattleDome_Text_Potential2[];
+extern const u8 BattleDome_Text_Potential3[];
+extern const u8 BattleDome_Text_Potential4[];
+extern const u8 BattleDome_Text_Potential5[];
+extern const u8 BattleDome_Text_Potential6[];
+extern const u8 BattleDome_Text_Potential7[];
+extern const u8 BattleDome_Text_Potential8[];
+extern const u8 BattleDome_Text_Potential9[];
+extern const u8 BattleDome_Text_Potential10[];
+extern const u8 BattleDome_Text_Potential11[];
+extern const u8 BattleDome_Text_Potential12[];
+extern const u8 BattleDome_Text_Potential13[];
+extern const u8 BattleDome_Text_Potential14[];
+extern const u8 BattleDome_Text_Potential15[];
+extern const u8 BattleDome_Text_Potential16[];
+extern const u8 BattleDome_Text_PotentialDomeAceTucker[];
+extern const u8 BattleDome_Text_StyleRiskDisaster[];
+extern const u8 BattleDome_Text_StyleEndureLongBattles[];
+extern const u8 BattleDome_Text_StyleVariesTactics[];
+extern const u8 BattleDome_Text_StyleToughWinningPattern[];
+extern const u8 BattleDome_Text_StyleUsesVeryRareMove[];
+extern const u8 BattleDome_Text_StyleUsesStartlingMoves[];
+extern const u8 BattleDome_Text_StyleConstantlyWatchesHP[];
+extern const u8 BattleDome_Text_StyleStoresAndLoosesPower[];
+extern const u8 BattleDome_Text_StyleEnfeeblesFoes[];
+extern const u8 BattleDome_Text_StylePrefersLuckTactics[];
+extern const u8 BattleDome_Text_StyleRegalAtmosphere[];
+extern const u8 BattleDome_Text_StylePowerfulLowPPMoves[];
+extern const u8 BattleDome_Text_StyleEnfeebleThenAttack[];
+extern const u8 BattleDome_Text_StyleBattlesWhileEnduring[];
+extern const u8 BattleDome_Text_StyleUpsetsFoesEmotionally[];
+extern const u8 BattleDome_Text_StyleStrongAndStraightforward[];
+extern const u8 BattleDome_Text_StyleAggressivelyStrongMoves[];
+extern const u8 BattleDome_Text_StyleCleverlyDodgesAttacks[];
+extern const u8 BattleDome_Text_StyleUsesUpsettingMoves[];
+extern const u8 BattleDome_Text_StyleUsesPopularMoves[];
+extern const u8 BattleDome_Text_StyleHasPowerfulComboMoves[];
+extern const u8 BattleDome_Text_StyleUsesHighProbabilityMoves[];
+extern const u8 BattleDome_Text_StyleAggressivelySpectacularMoves[];
+extern const u8 BattleDome_Text_StyleEmphasizesOffenseOverDefense[];
+extern const u8 BattleDome_Text_StyleEmphasizesDefenseOverOffense[];
+extern const u8 BattleDome_Text_StyleAttacksQuicklyStrongMoves[];
+extern const u8 BattleDome_Text_StyleUsesAddedEffectMoves[];
+extern const u8 BattleDome_Text_StyleUsesBalancedMixOfMoves[];
+extern const u8 BattleDome_Text_StyleSampleMessage1[];
+extern const u8 BattleDome_Text_StyleSampleMessage2[];
+extern const u8 BattleDome_Text_StyleSampleMessage3[];
+extern const u8 BattleDome_Text_StyleSampleMessage4[];
+extern const u8 BattleDome_Text_EmphasizesHPAndAtk[];
+extern const u8 BattleDome_Text_EmphasizesHPAndDef[];
+extern const u8 BattleDome_Text_EmphasizesHPAndSpeed[];
+extern const u8 BattleDome_Text_EmphasizesHPAndSpAtk[];
+extern const u8 BattleDome_Text_EmphasizesHPAndSpDef[];
extern const u8 gBattleDomeOpponentStatsText6[];
extern const u8 gBattleDomeOpponentStatsText7[];
extern const u8 gBattleDomeOpponentStatsText8[];
@@ -1769,13 +1769,13 @@ extern const u8 gBattleDomeOpponentStatsText12[];
extern const u8 gBattleDomeOpponentStatsText13[];
extern const u8 gBattleDomeOpponentStatsText14[];
extern const u8 gBattleDomeOpponentStatsText15[];
-extern const u8 gBattleDomeOpponentStatsText16[];
+extern const u8 BattleDome_Text_EmphasizesHP[];
extern const u8 gBattleDomeOpponentStatsText17[];
extern const u8 gBattleDomeOpponentStatsText18[];
extern const u8 gBattleDomeOpponentStatsText19[];
extern const u8 gBattleDomeOpponentStatsText20[];
extern const u8 gBattleDomeOpponentStatsText21[];
-extern const u8 gBattleDomeOpponentStatsText22[];
+extern const u8 BattleDome_Text_NeglectsHPAndAtk[];
extern const u8 gBattleDomeOpponentStatsText23[];
extern const u8 gBattleDomeOpponentStatsText24[];
extern const u8 gBattleDomeOpponentStatsText25[];
@@ -1790,13 +1790,13 @@ extern const u8 gBattleDomeOpponentStatsText33[];
extern const u8 gBattleDomeOpponentStatsText34[];
extern const u8 gBattleDomeOpponentStatsText35[];
extern const u8 gBattleDomeOpponentStatsText36[];
-extern const u8 gBattleDomeOpponentStatsText37[];
+extern const u8 BattleDome_Text_NeglectsHP[];
extern const u8 gBattleDomeOpponentStatsText38[];
extern const u8 gBattleDomeOpponentStatsText39[];
extern const u8 gBattleDomeOpponentStatsText40[];
extern const u8 gBattleDomeOpponentStatsText41[];
extern const u8 gBattleDomeOpponentStatsText42[];
-extern const u8 gBattleDomeOpponentStatsText43[];
+extern const u8 BattleDome_Text_RaisesMonsWellBalanced[];
extern const u8 gBattleDomeMatchNumberText1[];
extern const u8 gBattleDomeMatchNumberText2[];
extern const u8 gBattleDomeMatchNumberText3[];