ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

More battle_dome.c documentation

Browse Source
This commit is contained in:
GriffinR 2019-12-21 04:27:12 -05:00
parent ff2d8a9c4e
commit 3efc8199d4
7 changed files with 832 additions and 703 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/battle_frontier/battle_dome.inc
View File

@ -97,7 +97,7 @@
special CallBattleDomeFunction
.endm
@
@ Sets the facility trainer/mon set pointers
.macro dome_settrainers
setvar VAR_0x8004, BATTLE_DOME_FUNC_SET_TRAINERS
special CallBattleDomeFunction

116
data/text/battle_dome.inc
View File

@ -1,163 +1,163 @@
gBattleDomeOpponentPotentialText1::
BattleDome_Text_Potential1::
.string "The best candidate to be a champ!$"
gBattleDomeOpponentPotentialText2::
BattleDome_Text_Potential2::
.string "A sure-finalist team.$"
gBattleDomeOpponentPotentialText3::
BattleDome_Text_Potential3::
.string "A likely top-three finisher.$"
gBattleDomeOpponentPotentialText4::
BattleDome_Text_Potential4::
.string "A candidate to finish first.$"
gBattleDomeOpponentPotentialText5::
BattleDome_Text_Potential5::
.string "A team with top-class potential.$"
gBattleDomeOpponentPotentialText6::
BattleDome_Text_Potential6::
.string "The dark horse team this tournament.$"
gBattleDomeOpponentPotentialText7::
BattleDome_Text_Potential7::
.string "A better-than-average team.$"
gBattleDomeOpponentPotentialText8::
BattleDome_Text_Potential8::
.string "This tournament's average team.$"
gBattleDomeOpponentPotentialText9::
BattleDome_Text_Potential9::
.string "A team with average potential.$"
gBattleDomeOpponentPotentialText10::
BattleDome_Text_Potential10::
.string "A weaker-than-average team.$"
gBattleDomeOpponentPotentialText11::
BattleDome_Text_Potential11::
.string "A team looking for its first win.$"
gBattleDomeOpponentPotentialText12::
BattleDome_Text_Potential12::
.string "One win will make this team proud.$"
gBattleDomeOpponentPotentialText13::
BattleDome_Text_Potential13::
.string "Overall, a weak team.$"
gBattleDomeOpponentPotentialText14::
BattleDome_Text_Potential14::
.string "A team with very low potential.$"
gBattleDomeOpponentPotentialText15::
BattleDome_Text_Potential15::
.string "A team unlikely to win the tournament.$"
gBattleDomeOpponentPotentialText16::
BattleDome_Text_Potential16::
.string "The team most unlikely to win.$"
gBattleDomeOpponentPotentialText17::
BattleDome_Text_PotentialDomeAceTucker::
.string "The perfect, invincible superstar!$"
gBattleDomeOpponentStyleText1::
BattleDome_Text_StyleRiskDisaster::
.string "Willing to risk total disaster at times.$"
gBattleDomeOpponentStyleText2::
BattleDome_Text_StyleEndureLongBattles::
.string "Skilled at enduring long battles.$"
gBattleDomeOpponentStyleText3::
BattleDome_Text_StyleVariesTactics::
.string "Varies tactics to suit the opponent.$"
gBattleDomeOpponentStyleText4::
BattleDome_Text_StyleToughWinningPattern::
.string "Has a tough winning pattern.$"
gBattleDomeOpponentStyleText5::
BattleDome_Text_StyleUsesVeryRareMove::
.string "Occasionally uses a very rare move.$"
gBattleDomeOpponentStyleText6::
BattleDome_Text_StyleUsesStartlingMoves::
.string "Uses startling and disruptive moves.$"
gBattleDomeOpponentStyleText7::
BattleDome_Text_StyleConstantlyWatchesHP::
.string "Constantly watches HP in battle.$"
gBattleDomeOpponentStyleText8::
BattleDome_Text_StyleStoresAndLoosesPower::
.string "Good at storing then loosing power.$"
gBattleDomeOpponentStyleText9::
BattleDome_Text_StyleEnfeeblesFoes::
.string "Skilled at enfeebling foes.$"
gBattleDomeOpponentStyleText10::
BattleDome_Text_StylePrefersLuckTactics::
.string "Prefers tactics that rely on luck.$"
gBattleDomeOpponentStyleText11::
BattleDome_Text_StyleRegalAtmosphere::
.string "Attacks with a regal atmosphere.$"
gBattleDomeOpponentStyleText12::
BattleDome_Text_StylePowerfulLowPPMoves::
.string "Attacks with powerful, low-PP moves.$"
gBattleDomeOpponentStyleText13::
BattleDome_Text_StyleEnfeebleThenAttack::
.string "Skilled at enfeebling, then attacking.$"
gBattleDomeOpponentStyleText14::
BattleDome_Text_StyleBattlesWhileEnduring::
.string "Battles while enduring all attacks.$"
gBattleDomeOpponentStyleText15::
BattleDome_Text_StyleUpsetsFoesEmotionally::
.string "Skilled at upsetting foes emotionally.$"
gBattleDomeOpponentStyleText16::
BattleDome_Text_StyleStrongAndStraightforward::
.string "Uses strong and straightforward moves.$"
gBattleDomeOpponentStyleText17::
BattleDome_Text_StyleAggressivelyStrongMoves::
.string "Aggressively uses strong moves.$"
gBattleDomeOpponentStyleText18::
BattleDome_Text_StyleCleverlyDodgesAttacks::
.string "Battles while cleverly dodging attacks.$"
gBattleDomeOpponentStyleText19::
BattleDome_Text_StyleUsesUpsettingMoves::
.string "Skilled at using upsetting attacks.$"
gBattleDomeOpponentStyleText20::
BattleDome_Text_StyleUsesPopularMoves::
.string "Uses many popular moves.$"
gBattleDomeOpponentStyleText21::
BattleDome_Text_StyleHasPowerfulComboMoves::
.string "Has moves for powerful combinations.$"
gBattleDomeOpponentStyleText22::
BattleDome_Text_StyleUsesHighProbabilityMoves::
.string "Uses high-probability attacks.$"
gBattleDomeOpponentStyleText23::
BattleDome_Text_StyleAggressivelySpectacularMoves::
.string "Aggressively uses spectacular moves.$"
gBattleDomeOpponentStyleText24::
BattleDome_Text_StyleEmphasizesOffenseOverDefense::
.string "Emphasizes offense over defense.$"
gBattleDomeOpponentStyleText25::
BattleDome_Text_StyleEmphasizesDefenseOverOffense::
.string "Emphasizes defense over offense.$"
gBattleDomeOpponentStyleText26::
BattleDome_Text_StyleAttacksQuicklyStrongMoves::
.string "Attacks quickly with strong moves.$"
gBattleDomeOpponentStyleText27::
BattleDome_Text_StyleUsesAddedEffectMoves::
.string "Often uses moves with added effects.$"
gBattleDomeOpponentStyleText28::
BattleDome_Text_StyleUsesBalancedMixOfMoves::
.string "Uses a well-balanced mix of moves.$"
gBattleDomeOpponentStyleTextUnused1::
BattleDome_Text_StyleSampleMessage1::
.string "This is sample message 1.$"
gBattleDomeOpponentStyleTextUnused2::
BattleDome_Text_StyleSampleMessage2::
.string "This is sample message 2.$"
gBattleDomeOpponentStyleTextUnused3::
BattleDome_Text_StyleSampleMessage3::
.string "This is sample message 3.$"
gBattleDomeOpponentStyleTextUnused4::
BattleDome_Text_StyleSampleMessage4::
.string "This is sample message 4.$"
gBattleDomeOpponentStatsText1::
BattleDome_Text_EmphasizesHPAndAtk::
.string "Emphasizes HP and ATTACK.$"
gBattleDomeOpponentStatsText2::
BattleDome_Text_EmphasizesHPAndDef::
.string "Emphasizes HP and DEFENSE.$"
gBattleDomeOpponentStatsText3::
BattleDome_Text_EmphasizesHPAndSpeed::
.string "Emphasizes HP and SPEED.$"
gBattleDomeOpponentStatsText4::
BattleDome_Text_EmphasizesHPAndSpAtk::
.string "Emphasizes HP and SP. ATTACK.$"
gBattleDomeOpponentStatsText5::
BattleDome_Text_EmphasizesHPAndSpDef::
.string "Emphasizes HP and SP. DEFENSE.$"
gBattleDomeOpponentStatsText6::
@ -190,7 +190,7 @@ gBattleDomeOpponentStatsText14::
gBattleDomeOpponentStatsText15::
.string "Emphasizes SP. ATTACK and SP. DEFENSE.$"
gBattleDomeOpponentStatsText16::
BattleDome_Text_EmphasizesHP::
.string "Emphasizes HP.$"
gBattleDomeOpponentStatsText17::
@ -208,7 +208,7 @@ gBattleDomeOpponentStatsText20::
gBattleDomeOpponentStatsText21::
.string "Emphasizes SP. DEFENSE.$"
gBattleDomeOpponentStatsText22::
BattleDome_Text_NeglectsHPAndAtk::
.string "Neglects HP and ATTACK.$"
gBattleDomeOpponentStatsText23::
@ -253,7 +253,7 @@ gBattleDomeOpponentStatsText35::
gBattleDomeOpponentStatsText36::
.string "Neglects SP. ATTACK and SP. DEFENSE.$"
gBattleDomeOpponentStatsText37::
BattleDome_Text_NeglectsHP::
.string "Neglects HP.$"
gBattleDomeOpponentStatsText38::
@ -271,7 +271,7 @@ gBattleDomeOpponentStatsText41::
gBattleDomeOpponentStatsText42::
.string "Neglects SP. DEFENSE.$"
gBattleDomeOpponentStatsText43::
BattleDome_Text_RaisesMonsWellBalanced::
.string "Raises POKéMON in a well-balanced way.$"
gBattleDomeWinText1::

64
include/constants/battle_dome.h
View File

@ -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

21
include/global.h
View File

@ -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];

116
include/strings.h
View File

@ -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[];

1206
src/battle_dome.c
View File

File diff suppressed because it is too large Load Diff

10
src/battle_tower.c
View File

@ -2044,20 +2044,20 @@ u16 RandomizeFacilityTrainerMonSet(u16 trainerId)
{
u8 level = SetFacilityPtrsGetLevel();
const u16 *monSets = gFacilityTrainers[trainerId].monSets;
u8 bfMonCount = 0;
u32 monSetId = monSets[bfMonCount];
u8 numMonSets = 0;
u32 monSetId = monSets[numMonSets];
while (monSetId != 0xFFFF)
{
bfMonCount++;
monSetId = monSets[bfMonCount];
numMonSets++;
monSetId = monSets[numMonSets];
if (monSetId == 0xFFFF)
break;
}
do
{
monSetId = monSets[Random() % bfMonCount];
monSetId = monSets[Random() % numMonSets];
} while((level == 50 || level == 20) && monSetId > 849);
return monSetId;