Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-28 04:46:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015

Browse Source
This commit is contained in:
Eduardo Quezada
2024-10-15 20:56:56 -03:00
parent 0f8b2a1ba8 a55c75d350
commit 80447bee8e
140 changed files with 928 additions and 1969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/apprentice.c
View File

@@ -75,9 +75,9 @@ struct ApprenticeQuestionData
};
// IWRAM common
struct ApprenticePartyMovesData *gApprenticePartyMovesData;
struct ApprenticeQuestionData *gApprenticeQuestionData;
void (*gApprenticeFunc)(void);
COMMON_DATA struct ApprenticePartyMovesData *gApprenticePartyMovesData = NULL;
COMMON_DATA struct ApprenticeQuestionData *gApprenticeQuestionData = NULL;
COMMON_DATA void (*gApprenticeFunc)(void) = NULL;
// This file's functions.
static u16 GetRandomAlternateMove(u8 monId);