summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2017-10-09 16:42:21 -0500
committerGitHub <noreply@github.com>2017-10-09 16:42:21 -0500
commit3e72d6748771f83c98be2864e6bb628e161c6cf2 (patch)
tree7edfb8b54fe1e694e946d17399a3099f3ad7b140 /include/global.h
parent08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (diff)
parentb6ec90db6192c8405c9fe952aae7f356bcd1b0c3 (diff)
Merge pull request #65 from DizzyEggg/decompile_battle_message
Decompile battle message
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h37
1 files changed, 19 insertions, 18 deletions
diff --git a/include/global.h b/include/global.h
index e0c09d29a..e98b01ee2 100644
--- a/include/global.h
+++ b/include/global.h
@@ -225,24 +225,25 @@ extern struct SaveBlock2 *gSaveBlock2Ptr;
struct SecretBaseRecord
{
- /*ID?*/ /*0x1A08*/ u8 sbr_field_0;
- /*0x1A09*/ u8 sbr_field_1_0:4;
- /*0x1A09*/ u8 gender:1;
- /*0x1A09*/ u8 sbr_field_1_5:1;
- /*0x1A09*/ u8 sbr_field_1_6:2;
- /*0x1A0A*/ u8 sbr_field_2[7]; // 0xFF bytes?
- /*0x1A12*/ u8 trainerId[4]; // byte 0 is used for determining trainer class
- /*0x1A16*/ u16 sbr_field_e;
- /*0x1A18*/ u8 sbr_field_10;
- /*0x1A19*/ u8 sbr_field_11;
- /*0x1A1A*/ u8 decorations[16];
- /*0x1A2A*/ u8 decorationPos[16];
- /*0x1A3A*/ u32 partyPersonality[6];
- /*0x1A54*/ u16 partyMoves[6 * 4];
- /*0x1A84*/ u16 partySpecies[6];
- /*0x1A90*/ u16 partyHeldItems[6];
- /*0x1A9C*/ u8 partyLevels[6];
- /*0x1AA2*/ u8 partyEVs[6];
+ u8 sbr_field_0;
+ u8 sbr_field_1_0:4;
+ u8 gender:1;
+ u8 sbr_field_1_5:1;
+ u8 sbr_field_1_6:2;
+ u8 trainerName[7];
+ u8 trainerId[4]; // byte 0 is used for determining trainer class
+ u8 language;
+ u16 sbr_field_e;
+ u8 sbr_field_10;
+ u8 sbr_field_11;
+ u8 decorations[16];
+ u8 decorationPos[16];
+ u32 partyPersonality[6];
+ u16 partyMoves[6 * 4];
+ u16 partySpecies[6];
+ u16 partyHeldItems[6];
+ u8 partyLevels[6];
+ u8 partyEVs[6];
};
#include "game_stat.h"