ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Best Streak stat name

Browse Source
This commit is contained in:
GriffinR 2023-01-20 11:25:04 -05:00
parent 0851e55ccb
commit 29c1af50ca
4 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/specials.inc
View File

@ -258,7 +258,7 @@ gSpecials::
def_special CallSlateportTentFunction def_special CallSlateportTentFunction
def_special ChoosePartyForBattleFrontier def_special ChoosePartyForBattleFrontier
def_special ValidateEReaderTrainer def_special ValidateEReaderTrainer
def_special GetBestBattleTowerStreak def_special GetBattleTowerSinglesStreak
def_special ReducePlayerPartyToSelectedMons def_special ReducePlayerPartyToSelectedMons
def_special BedroomPC def_special BedroomPC
def_special PlayerPC def_special PlayerPC

2
include/constants/game_stat.h
View File

@ -33,7 +33,7 @@
#define GAME_STAT_CONSECUTIVE_ROULETTE_WINS 29 #define GAME_STAT_CONSECUTIVE_ROULETTE_WINS 29
#define GAME_STAT_ENTERED_BATTLE_TOWER 30 #define GAME_STAT_ENTERED_BATTLE_TOWER 30
#define GAME_STAT_UNKNOWN_31 31 #define GAME_STAT_UNKNOWN_31 31
#define GAME_STAT_BATTLE_TOWER_BEST_STREAK 32 #define GAME_STAT_BATTLE_TOWER_SINGLES_STREAK 32
#define GAME_STAT_POKEBLOCKS 33 #define GAME_STAT_POKEBLOCKS 33
#define GAME_STAT_POKEBLOCKS_WITH_FRIENDS 34 #define GAME_STAT_POKEBLOCKS_WITH_FRIENDS 34
#define GAME_STAT_WON_LINK_CONTEST 35 #define GAME_STAT_WON_LINK_CONTEST 35

4
src/field_specials.c
View File

@ -1234,9 +1234,9 @@ void GetSecretBaseNearbyMapName(void)
GetMapName(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0); GetMapName(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0);
} }
u16 GetBestBattleTowerStreak(void) u16 GetBattleTowerSinglesStreak(void)
{ {
return GetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK); return GetGameStat(GAME_STAT_BATTLE_TOWER_SINGLES_STREAK);
} }
void BufferEReaderTrainerName(void) void BufferEReaderTrainerName(void)

2
src/frontier_util.c
View File

@ -2122,7 +2122,7 @@ static void IncrementWinStreak(void)
gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]++; gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]++;
if (battleMode == FRONTIER_MODE_SINGLES) if (battleMode == FRONTIER_MODE_SINGLES)
{ {
SetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK, gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]); SetGameStat(GAME_STAT_BATTLE_TOWER_SINGLES_STREAK, gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]);
gSaveBlock2Ptr->frontier.towerSinglesStreak = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]; gSaveBlock2Ptr->frontier.towerSinglesStreak = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode];
} }
} }