More battle_dome.c doc

7 files changed, 162 insertions, 113 deletions

diff --git a/include/battle_tower.h b/include/battle_tower.h
index fe4cd938a..0cc4d7025 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -8,8 +8,8 @@ struct RSBattleTowerRecord
     /*0x02*/ u16 winStreak;
     /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
     /*0x0C*/ u8 trainerId[TRAINER_ID_LENGTH];
-    /*0x10*/ u16 greeting[6];
-    /*0x1C*/ struct BattleTowerPokemon party[3];
+    /*0x10*/ u16 greeting[EASY_CHAT_BATTLE_WORDS_COUNT];
+    /*0x1C*/ struct BattleTowerPokemon party[FRONTIER_PARTY_SIZE];
     /*0xA0*/ u32 checksum;
 };
 
@@ -18,10 +18,10 @@ struct BattleFrontierTrainer
     u8 facilityClass;
     u8 filler1[3];
     u8 trainerName[PLAYER_NAME_LENGTH + 1];
-    u16 speechBefore[6];
-    u16 speechWin[6];
-    u16 speechLose[6];
-    const u16 *monSets;
+    u16 speechBefore[EASY_CHAT_BATTLE_WORDS_COUNT];
+    u16 speechWin[EASY_CHAT_BATTLE_WORDS_COUNT];
+    u16 speechLose[EASY_CHAT_BATTLE_WORDS_COUNT];
+    const u16 *monSet;
 };
 
 struct FacilityMon
@@ -59,7 +59,7 @@ u8 GetFrontierOpponentClass(u16 trainerId);
 void GetFrontierTrainerName(u8 *dst, u16 trainerId);
 void FillFrontierTrainerParty(u8 monsCount);
 void FillFrontierTrainersParties(u8 monsCount);
-u16 RandomizeFacilityTrainerMonSet(u16 trainerId);
+u16 GetRandomFrontierMonFromSet(u16 trainerId);
 void FrontierSpeechToString(const u16 *words);
 void DoSpecialTrainerBattle(void);
 void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *record);
diff --git a/include/constants/battle_dome.h b/include/constants/battle_dome.h
index 46310c6ce..ea7310e55 100644
--- a/include/constants/battle_dome.h
+++ b/include/constants/battle_dome.h
@@ -7,7 +7,7 @@
 #define DOME_FINAL         3
 #define DOME_ROUNDS_COUNT  4
 
-//#define DOME_TOURNAMENT_TRAINERS_COUNT 16 : defined in global
+//#define DOME_TOURNAMENT_TRAINERS_COUNT 16 -- defined in global
 #define DOME_TOURNAMENT_MATCHES_COUNT  DOME_TOURNAMENT_TRAINERS_COUNT - 1
 
 #define DOME_BATTLE_PARTY_SIZE  2
@@ -24,7 +24,7 @@
 #define BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY        5
 #define BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO         6
 #define BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE          7
-#define BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE     8
+#define BATTLE_DOME_FUNC_SHOW_PREV_TOURNEY_TREE     8
 #define BATTLE_DOME_FUNC_SET_OPPONENT_ID            9
 #define BATTLE_DOME_FUNC_SET_OPPONENT_GFX           10
 #define BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE   11
@@ -49,37 +49,82 @@
 #define DOME_DATA_ATTEMPTED_CHALLENGE     6
 #define DOME_DATA_HAS_WON_CHALLENGE       7
 #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_DATA_PREV_TOURNEY_TYPE       9
 
+// ID for Exit/Cancel on the tourney tree
+#define TOURNEY_TREE_CLOSE_BUTTON  31
+
+// Input IDs on the tourney tree
+#define TOURNEY_TREE_SELECTED_CLOSE   0
+#define TOURNEY_TREE_NO_SELECTION     1
+#define TOURNEY_TREE_SELECTED_TRAINER 2
+#define TOURNEY_TREE_SELECTED_MATCH   3
+
+// Modes for showing the tourney tree info card
+#define INFOCARD_NEXT_OPPONENT  0
+#define INFOCARD_TRAINER        1
+#define INFOCARD_MATCH          2
+
+// Input IDs for the info cards
+#define INFOCARD_INPUT_NONE      0
+#define TRAINERCARD_INPUT_UP     1
+#define TRAINERCARD_INPUT_DOWN   2
+#define TRAINERCARD_INPUT_LEFT   3
+#define TRAINERCARD_INPUT_RIGHT  4
+#define MATCHCARD_INPUT_UP       5
+#define MATCHCARD_INPUT_DOWN     6
+#define MATCHCARD_INPUT_LEFT     7
+#define MATCHCARD_INPUT_RIGHT    8
+#define INFOCARD_INPUT_AB        9
+
+#define CARD_ALTERNATE_SLOT (1 << 0) // When set, uses an alternate slot to store the incoming card sprites
+#define MOVE_CARD_RIGHT     (1 << 1)
+#define MOVE_CARD_DOWN      (1 << 2)
+#define MOVE_CARD_LEFT      (1 << 3)
+#define MOVE_CARD_UP        (1 << 4)
+#define MOVE_CARD           (MOVE_CARD_RIGHT | MOVE_CARD_DOWN | MOVE_CARD_LEFT | MOVE_CARD_UP)
+
+// Text IDs for sBattleDomeWinTexts
+#define DOME_TEXT_NO_WINNER_YET     0
+#define DOME_TEXT_WON_USING_MOVE    1
+#define DOME_TEXT_CHAMP_USING_MOVE  2
+#define DOME_TEXT_WON_ON_FORFEIT    3
+#define DOME_TEXT_CHAMP_ON_FORFEIT  4
+#define DOME_TEXT_WON_NO_MOVES      5
+#define DOME_TEXT_CHAMP_NO_MOVES    6
+
+// Offsets/start positions within sBattleDomeOpponentStatsTexts
+#define DOME_TEXT_TWO_GOOD_STATS   0
+#define DOME_TEXT_ONE_GOOD_STAT    15
+#define DOME_TEXT_TWO_BAD_STATS    21
+#define DOME_TEXT_ONE_BAD_STAT     36
+#define DOME_TEXT_WELL_BALANCED    42
+#define DOME_TEXT_HP    0
+#define DOME_TEXT_ATK   5
+#define DOME_TEXT_DEF   9
+#define DOME_TEXT_SPEED 12
+#define DOME_TEXT_SPATK 14
+
+// Move point indexes for sBattleStyleMovePoints[][], to determine Battle Dome trainers battle styles
+#define MOVE_POINTS_COMBO      0   // Moves that work well in combination (e.g. Rain Dance + Hydro Pump)
+#define MOVE_POINTS_STAT_RAISE 1
+#define MOVE_POINTS_STAT_LOWER 2
+#define MOVE_POINTS_RARE       3   // Uncommon moves. Mostly arbitrary
+#define MOVE_POINTS_HEAL       4
+#define MOVE_POINTS_RISKY      5
+#define MOVE_POINTS_STATUS     6
+#define MOVE_POINTS_DMG        7
+#define MOVE_POINTS_DEF        8   // Defensive moves, like Amnesia, Light Screen, or accuracy-lowers
+#define MOVE_POINTS_ACCURATE   9
+#define MOVE_POINTS_POWERFUL   10  // Most of the moves that are >= 100 power
+#define MOVE_POINTS_POPULAR    11  // Group seems arbitrary. All using it are TM/HMs, but its only 11/58
+#define MOVE_POINTS_LUCK       12  
+#define MOVE_POINTS_STRONG     13  // Most of the moves that are >= 90 power
+#define MOVE_POINTS_LOW_PP     14
+#define MOVE_POINTS_EFFECT     15  // Moves with additional effects
+#define NUM_MOVE_POINT_TYPES   16
+
+// Battle style IDs for sBattleDomeOpponentStyleTexts
 #define DOME_BATTLE_STYLE_RISKY           0
 #define DOME_BATTLE_STYLE_STALL           1
 #define DOME_BATTLE_STYLE_VARIED          2
@@ -90,7 +135,7 @@
 #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_REGAL           10
 #define DOME_BATTLE_STYLE_LOW_PP          11
 #define DOME_BATTLE_STYLE_STATUS_ATK      12
 #define DOME_BATTLE_STYLE_ENDURE          13
diff --git a/include/constants/battle_frontier_mons.h b/include/constants/battle_frontier_mons.h
index 64367272d..10e68980a 100644
--- a/include/constants/battle_frontier_mons.h
+++ b/include/constants/battle_frontier_mons.h
@@ -859,6 +859,8 @@
 #define FRONTIER_MON_LATIOS_7       848
 #define FRONTIER_MON_LATIOS_8       849
 
+#define FRONTIER_MONS_HIGH_TIER     849 // Mons above this point can only appear > level 50
+
 #define FRONTIER_MON_DRAGONITE_1    850
 #define FRONTIER_MON_DRAGONITE_2    851
 #define FRONTIER_MON_DRAGONITE_3    852
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 181a84023..97e3f0686 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -80,7 +80,8 @@
 #define STAT_ACC     6 // Only in battles.
 #define STAT_EVASION 7 // Only in battles.
 
-#define NUM_BATTLE_STATS 8
+#define NUM_EV_STATS     NUM_STATS - 1 // excludes HP
+#define NUM_BATTLE_STATS NUM_STATS + 2 // includes Accuracy and Evasion
 
 // Shiny odds
 #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
diff --git a/include/graphics.h b/include/graphics.h
index 146803cfa..a8d4453b0 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4117,19 +4117,19 @@ extern const u16 gTitleScreenBgPalettes[];
 extern const u16 gTitleScreenPressStartPal[];
 extern const u16 gTitleScreenEmeraldVersionPal[];
 
-extern const u32 gUnknown_08D83D50[];
-extern const u32 gUnknown_08D84970[];
-extern const u32 gUnknown_08D84F00[];
-extern const u32 gUnknown_08D85444[];
-extern const u32 gUnknown_08D85358[];
-extern const u32 gBattleWindowTextPalette[];
-extern const u32 gUnknown_08D854C8[];
-extern const u32 gUnknown_08D82F10[];
-extern const u32 gUnknown_08D834FC[];
-extern const u32 gUnknown_08D83B2C[];
-extern const u32 gUnknown_08D83C3C[];
-extern const u32 gUnknown_08D83900[];
-extern const u32 gBattleFrontierGfx_DomeOptions[];
+// Battle Dome
+extern const u32 gDomeTourneyInfoCard_Gfx[];
+extern const u32 gDomeTourneyInfoCard_Tilemap[];
+extern const u32 gDomeTourneyInfoCardBg_Tilemap[];
+extern const u32 gDomeTourneyTree_Pal[];
+extern const u32 gDomeTourneyTreeButtons_Pal[];
+extern const u32 gDomeTourneyMatchCardBg_Pal[];
+extern const u32 gDomeTourneyBg_Gfx[];
+extern const u32 gDomeTourneyLine_Gfx[];
+extern const u32 gDomeTourneyLineDown_Tilemap[];
+extern const u32 gDomeTourneyLineUp_Tilemap[];
+extern const u32 gDomeTourneyLineMask_Tilemap[];
+extern const u32 gDomeTourneyTreeButtons_Gfx[];
 extern const u16 gTilesetAnims_BattleDomePals0_0[];
 extern const u16 gTilesetAnims_BattleDomePals0_1[];
 extern const u16 gTilesetAnims_BattleDomePals0_2[];
@@ -4137,6 +4137,9 @@ extern const u16 gTilesetAnims_BattleDomePals0_3[];
 
 extern const u32 gBattleArenaJudgementSymbolsGfx[];
 extern const u32 gBattleArenaJudgementSymbolsPalette[];
+
+extern const u32 gBattleWindowTextPalette[];
+
 extern const u32 gContest2Pal[];
 
 extern const u32 gBattleAnimSpriteGfx_Bone[];
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index 9d56aebcb..dbd7f2895 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -16,7 +16,7 @@ void LoadMonIconPalette(u16 species);
 void FreeMonIconPalettes(void);
 u8 sub_80D2D78(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra);
 void FreeMonIconPalette(u16 species);
-void sub_80D2EF8(struct Sprite *sprite);
+void FreeAndDestroyMonIconSprite(struct Sprite *sprite);
 u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
 u8 UpdateMonIconFrame(struct Sprite *sprite);
 void LoadMonIconPalette(u16 species);
diff --git a/include/strings.h b/include/strings.h
index f3d9aed98..c56940bbe 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1759,66 +1759,66 @@ 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[];
-extern const u8 gBattleDomeOpponentStatsText9[];
-extern const u8 gBattleDomeOpponentStatsText10[];
-extern const u8 gBattleDomeOpponentStatsText11[];
-extern const u8 gBattleDomeOpponentStatsText12[];
-extern const u8 gBattleDomeOpponentStatsText13[];
-extern const u8 gBattleDomeOpponentStatsText14[];
-extern const u8 gBattleDomeOpponentStatsText15[];
+extern const u8 BattleDome_Text_EmphasizesAtkAndDef[];
+extern const u8 BattleDome_Text_EmphasizesAtkAndSpeed[];
+extern const u8 BattleDome_Text_EmphasizesAtkAndSpAtk[];
+extern const u8 BattleDome_Text_EmphasizesAtkAndSpDef[];
+extern const u8 BattleDome_Text_EmphasizesDefAndSpeed[];
+extern const u8 BattleDome_Text_EmphasizesDefAndSpAtk[];
+extern const u8 BattleDome_Text_EmphasizesDefAndSpDef[];
+extern const u8 BattleDome_Text_EmphasizesSpeedAndSpAtk[];
+extern const u8 BattleDome_Text_EmphasizesSpeedAndSpDef[];
+extern const u8 BattleDome_Text_EmphasizesSpAtkAndSpDef[];
 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 BattleDome_Text_EmphasizesAtk[];
+extern const u8 BattleDome_Text_EmphasizesDef[];
+extern const u8 BattleDome_Text_EmphasizesSpeed[];
+extern const u8 BattleDome_Text_EmphasizesSpAtk[];
+extern const u8 BattleDome_Text_EmphasizesSpDef[];
 extern const u8 BattleDome_Text_NeglectsHPAndAtk[];
-extern const u8 gBattleDomeOpponentStatsText23[];
-extern const u8 gBattleDomeOpponentStatsText24[];
-extern const u8 gBattleDomeOpponentStatsText25[];
-extern const u8 gBattleDomeOpponentStatsText26[];
-extern const u8 gBattleDomeOpponentStatsText27[];
-extern const u8 gBattleDomeOpponentStatsText28[];
-extern const u8 gBattleDomeOpponentStatsText29[];
-extern const u8 gBattleDomeOpponentStatsText30[];
-extern const u8 gBattleDomeOpponentStatsText31[];
-extern const u8 gBattleDomeOpponentStatsText32[];
-extern const u8 gBattleDomeOpponentStatsText33[];
-extern const u8 gBattleDomeOpponentStatsText34[];
-extern const u8 gBattleDomeOpponentStatsText35[];
-extern const u8 gBattleDomeOpponentStatsText36[];
+extern const u8 BattleDome_Text_NeglectsHPAndDef[];
+extern const u8 BattleDome_Text_NeglectsHPAndSpeed[];
+extern const u8 BattleDome_Text_NeglectsHPAndSpAtk[];
+extern const u8 BattleDome_Text_NeglectsHPAndSpDef[];
+extern const u8 BattleDome_Text_NeglectsAtkAndDef[];
+extern const u8 BattleDome_Text_NeglectsAtkAndSpeed[];
+extern const u8 BattleDome_Text_NeglectsAtkAndSpAtk[];
+extern const u8 BattleDome_Text_NeglectsAtkAndSpDef[];
+extern const u8 BattleDome_Text_NeglectsDefAndSpeed[];
+extern const u8 BattleDome_Text_NeglectsDefAndSpAtk[];
+extern const u8 BattleDome_Text_NeglectsDefAndSpDef[];
+extern const u8 BattleDome_Text_NeglectsSpeedAndSpAtk[];
+extern const u8 BattleDome_Text_NeglectsSpeedAndSpDef[];
+extern const u8 BattleDome_Text_NeglectsSpAtkAndSpDef[];
 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 BattleDome_Text_NeglectsAtk[];
+extern const u8 BattleDome_Text_NeglectsDef[];
+extern const u8 BattleDome_Text_NeglectsSpeed[];
+extern const u8 BattleDome_Text_NeglectsSpAtk[];
+extern const u8 BattleDome_Text_NeglectsSpDef[];
 extern const u8 BattleDome_Text_RaisesMonsWellBalanced[];
-extern const u8 gBattleDomeMatchNumberText1[];
-extern const u8 gBattleDomeMatchNumberText2[];
-extern const u8 gBattleDomeMatchNumberText3[];
-extern const u8 gBattleDomeMatchNumberText4[];
-extern const u8 gBattleDomeMatchNumberText5[];
-extern const u8 gBattleDomeMatchNumberText6[];
-extern const u8 gBattleDomeMatchNumberText7[];
-extern const u8 gBattleDomeMatchNumberText8[];
-extern const u8 gBattleDomeMatchNumberText9[];
-extern const u8 gBattleDomeMatchNumberText10[];
-extern const u8 gBattleDomeMatchNumberText11[];
-extern const u8 gBattleDomeMatchNumberText12[];
-extern const u8 gBattleDomeMatchNumberText13[];
-extern const u8 gBattleDomeMatchNumberText14[];
-extern const u8 gBattleDomeMatchNumberText15[];
-extern const u8 gBattleDomeWinText1[];
-extern const u8 gBattleDomeWinText2[];
-extern const u8 gBattleDomeWinText3[];
-extern const u8 gBattleDomeWinText4[];
-extern const u8 gBattleDomeWinText5[];
-extern const u8 gBattleDomeWinText6[];
-extern const u8 gBattleDomeWinText7[];
+extern const u8 BattleDome_Text_Round1Match1[];
+extern const u8 BattleDome_Text_Round1Match2[];
+extern const u8 BattleDome_Text_Round1Match3[];
+extern const u8 BattleDome_Text_Round1Match4[];
+extern const u8 BattleDome_Text_Round1Match5[];
+extern const u8 BattleDome_Text_Round1Match6[];
+extern const u8 BattleDome_Text_Round1Match7[];
+extern const u8 BattleDome_Text_Round1Match8[];
+extern const u8 BattleDome_Text_Round2Match1[];
+extern const u8 BattleDome_Text_Round2Match2[];
+extern const u8 BattleDome_Text_Round2Match3[];
+extern const u8 BattleDome_Text_Round2Match4[];
+extern const u8 BattleDome_Text_SemifinalMatch1[];
+extern const u8 BattleDome_Text_SemifinalMatch2[];
+extern const u8 BattleDome_Text_FinalMatch[];
+extern const u8 BattleDome_Text_LetTheBattleBegin[];
+extern const u8 BattleDome_Text_TrainerWonUsingMove[];
+extern const u8 BattleDome_Text_TrainerBecameChamp[];
+extern const u8 BattleDome_Text_TrainerWonByDefault[];
+extern const u8 BattleDome_Text_TrainerWonOutrightByDefault[];
+extern const u8 BattleDome_Text_TrainerWonNoMoves[];
+extern const u8 BattleDome_Text_TrainerWonOutrightNoMoves[];
 
 // Battle Pyramid.
 extern const u8 BattlePyramid_Text_ExitHintUp1[];
@@ -1948,8 +1948,6 @@ extern const u8 BattlePyramid_Text_FiveTrainersRemaining6[];
 extern const u8 BattlePyramid_Text_SixTrainersRemaining6[];
 extern const u8 BattlePyramid_Text_SevenTrainersRemaining6[];
 
-
-
 // PC strings
 extern const u8 gText_ExitFromBox[];
 extern const u8 gText_WhatDoYouWantToDo[];