dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix pokeblock conflicts

Browse Source
This commit is contained in:
DizzyEggg committed 2017-12-18 16:58:14 +01:00
2 parents c3abe2863f 6a674e1e83
commit cb229f56e8
174 files changed
+5529 -7226
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/secret_base.c
+1 -1
View File
@@ -1283,7 +1283,7 @@ u8 sub_80EA20C(u8 secretBaseRecordId)
return (gSaveBlock1Ptr->secretBases[secretBaseRecordId].trainerId[0] % 5) + (gSaveBlock1Ptr->secretBases[secretBaseRecordId].gender * 5);
}
const u8 *sub_80EA250(void)
const u8 *GetSecretBaseTrainerLoseText(void)
{
u8 param;