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

Merge pull request #1893 from Bassoonian/fixfishinggamestat

Browse Source 
Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS
This commit is contained in:
GriffinR 2023-06-05 08:45:05 -04:00 committed by GitHub
commit 859eb4dab6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/game_stat.h
View File

@ -13,7 +13,7 @@
#define GAME_STAT_TRAINER_BATTLES 9 #define GAME_STAT_TRAINER_BATTLES 9
#define GAME_STAT_ENTERED_HOF 10 #define GAME_STAT_ENTERED_HOF 10
#define GAME_STAT_POKEMON_CAPTURES 11 #define GAME_STAT_POKEMON_CAPTURES 11
#define GAME_STAT_FISHING_CAPTURES 12 #define GAME_STAT_FISHING_ENCOUNTERS 12
#define GAME_STAT_HATCHED_EGGS 13 #define GAME_STAT_HATCHED_EGGS 13
#define GAME_STAT_EVOLVED_POKEMON 14 #define GAME_STAT_EVOLVED_POKEMON 14
#define GAME_STAT_USED_POKECENTER 15 #define GAME_STAT_USED_POKECENTER 15

2
src/mauville_old_man.c
View File

@ -969,7 +969,7 @@ static const struct Story sStorytellerStories[] = {
MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory
}, },
{ {
GAME_STAT_FISHING_CAPTURES, 1, GAME_STAT_FISHING_ENCOUNTERS, 1,
MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle, MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle,
MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction, MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction,
MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory

2
src/wild_encounter.c
View File

@ -783,7 +783,7 @@ void FishingWildEncounter(u8 rod)
{ {
species = GenerateFishingWildMon(gWildMonHeaders[GetCurrentMapWildMonHeaderId()].fishingMonsInfo, rod); species = GenerateFishingWildMon(gWildMonHeaders[GetCurrentMapWildMonHeaderId()].fishingMonsInfo, rod);
} }
IncrementGameStat(GAME_STAT_FISHING_CAPTURES); IncrementGameStat(GAME_STAT_FISHING_ENCOUNTERS);
SetPokemonAnglerSpecies(species); SetPokemonAnglerSpecies(species);
BattleSetup_StartWildBattle(); BattleSetup_StartWildBattle();
} }