diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-12 14:00:47 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-12 14:00:47 -0500 |
| commit | 4ac064bbaf54966082a860e6b6723c5ec654c436 (patch) | |
| tree | b419b2bb1a7fe7d17c440d58e5000c21e832386c /include/global.h | |
| parent | f81c52b56e865d8ecc753a69a31a5148548320a6 (diff) | |
| parent | a4787bc06a323071d32d3e0705e9cd39d9221452 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index 0e5615eb0..4a71a8a87 100644 --- a/include/global.h +++ b/include/global.h @@ -11,6 +11,7 @@ // to help in decompiling #define asm_comment(x) asm volatile("@ -- " x " -- ") #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") +#define ASM_DIRECT __attribute__((naked)) // IDE support #if defined (__APPLE__) || defined (__CYGWIN__) @@ -87,6 +88,7 @@ enum LanguageId LANGUAGE_SPANISH = 7, }; +#define GAME_VERSION (VERSION_EMERALD) #define GAME_LANGUAGE (LANGUAGE_ENGLISH) enum @@ -605,6 +607,11 @@ struct WaldaPhrase bool8 patternUnlocked; }; +struct UnkSaveSubstruct_3b98 { + u32 trainerId; + u8 trainerName[8]; +}; + struct SaveBlock1 { /*0x00*/ struct Coords16 pos; @@ -689,7 +696,9 @@ struct SaveBlock1 /*0x3B14*/ struct RecordMixingGift recordMixingGift; /*0x3B24*/ u8 seen2[52]; /*0x3B58*/ LilycoveLady lilycoveLady; - /*0x3B88*/ u8 filler_3B88[0x1E8]; + /*0x3B88*/ u8 filler_3B88[0x10]; + /*0x3B98*/ struct UnkSaveSubstruct_3b98 unk_3B98[20]; + /*0x3C88*/ u8 filler_3C88[0xE8]; /*0x3D70*/ struct WaldaPhrase waldaPhrase; // sizeof: 0x3D88 }; |