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

Document more of apprentice

Browse Source
This commit is contained in:
DizzyEggg
2018-10-14 14:35:51 +02:00
parent b4a42a6832
commit 145df49063
9 changed files with 141 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/apprentice.h
View File

@@ -14,6 +14,7 @@ struct ApprenticeTrainer
extern const struct ApprenticeTrainer gApprentices[];
void CopyFriendsApprenticeChallengeText(u8 saveblockApprenticeId);
const u8 *GetApprenticeNameInLanguage(u32 apprenticeId, s32 language);
#endif // GUARD_APPRENTICE_H

11
include/constants/apprentice.h
View File

@@ -8,4 +8,15 @@
#define APPRENTICE_ASK_GIVE 4
#define APPRENTICE_ASK_YES_NO 6
#define APPRENTICE_BUFF_SPECIES1 0
#define APPRENTICE_BUFF_SPECIES2 1
#define APPRENTICE_BUFF_SPECIES3 2
#define APPRENTICE_BUFF_MOVE1 3
#define APPRENTICE_BUFF_MOVE2 4
#define APPRENTICE_BUFF_ITEM 5
#define APPRENTICE_BUFF_NAME 6
#define APPRENTICE_BUFF_EASY_CHAT 7
#define APPRENTICE_BUFF_LEVEL 8
#define APPRENTICE_BUFF_SPECIES4 9
#endif // GUARD_CONSTANTS_APPRENTICE_H

11
include/global.h
View File

@@ -304,11 +304,10 @@ struct ApprenticeMon
struct Apprentice
{
u8 field_0_0:5;
u8 field_0_1:2;
u8 id:5;
u8 lvlMode:2; // + 1
u8 field_1;
u8 field_2;
u8 field_3;
u8 number;
struct ApprenticeMon monData[3];
u16 easyChatWords[6];
u8 playerId[4];
@@ -514,7 +513,7 @@ struct SaveBlock2
/*0xA8*/ u32 field_A8;
/*0xAC*/ u32 encryptionKey;
// TODO: fix and verify labels
// Possibly player's apprentice, will document once battle tower is decompiled.
/*0xB0*/ u8 field_B0;
/*0xB1*/ u8 field_B1_0:2;
/*0xB1*/ u8 field_B1_1:4;
@@ -524,7 +523,7 @@ struct SaveBlock2
/*0xB3*/ u8 field_B3;
/*0xB4*/ u8 field_B4[3];
/*0xB8*/ struct Sav2_B8 field_B8[9];
/*0xDC*/ struct Apprentice field_DC[4];
/*0xDC*/ struct Apprentice apprentices[4];
/*0x1EC*/ struct BerryCrush berryCrush;
/*0x1FC*/ struct PokemonJumpResults pokeJump;
/*0x20C*/ struct BerryPickingResults berryPick;