diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-12-11 15:21:48 -0500 |
---|---|---|
committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-12-11 12:21:48 -0800 |
commit | c7b4ec3cdf5fce8d48f73166d08c37aaaaac98ab (patch) | |
tree | 6f0ea9639daf2f41a817f4d93be9a01d24862f65 /include | |
parent | d145c73c8e68bd210474f9682a3134014ed78d9d (diff) |
decompile more of matsuda_debug_menu.c (#122)
* begin decompiling matsuda_debug_menu.c
* i'm sorry for misspelling your name
* decompile more masuda_debug_menu.c
* mergable state
* whatever yama
* more decompilation of matsuda_debug_menu.c
* matsuda debug text label consistency
* add current work
Diffstat (limited to 'include')
-rw-r--r-- | include/pokemon.h | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 956a3984f..dd80e1ea1 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -128,41 +128,41 @@ struct PokemonSubstruct2 struct PokemonSubstruct3 { - u8 pokerus; - u8 metLocation; + /* 0x00 */ u8 pokerus; + /* 0x01 */ u8 metLocation; - u16 metLevel:7; - u16 metGame:4; - u16 pokeball:4; - u16 otGender:1; + /* 0x02 */ u16 metLevel:7; + /* 0x02 */ u16 metGame:4; + /* 0x03 */ u16 pokeball:4; + /* 0x03 */ u16 otGender:1; - u32 hpIV:5; - u32 attackIV:5; - u32 defenseIV:5; - u32 speedIV:5; - u32 spAttackIV:5; - u32 spDefenseIV:5; - u32 isEgg:1; - u32 altAbility:1; + /* 0x04 */ u32 hpIV:5; + /* 0x04 */ u32 attackIV:5; + /* 0x05 */ u32 defenseIV:5; + /* 0x05 */ u32 speedIV:5; + /* 0x05 */ u32 spAttackIV:5; + /* 0x06 */ u32 spDefenseIV:5; + /* 0x07 */ u32 isEgg:1; + /* 0x07 */ u32 altAbility:1; - u32 coolRibbon:3; - u32 beautyRibbon:3; - u32 cuteRibbon:3; - u32 smartRibbon:3; - u32 toughRibbon:3; - u32 championRibbon:1; - u32 winningRibbon:1; - u32 victoryRibbon:1; - u32 artistRibbon:1; - u32 effortRibbon:1; - u32 giftRibbon1:1; - u32 giftRibbon2:1; - u32 giftRibbon3:1; - u32 giftRibbon4:1; - u32 giftRibbon5:1; - u32 giftRibbon6:1; - u32 giftRibbon7:1; - u32 fatefulEncounter:5; // unused in Ruby/Sapphire, but the high bit must be set for Mew/Deoxys to obey in FR/LG/Emerald + /* 0x08 */ u32 coolRibbon:3; + /* 0x08 */ u32 beautyRibbon:3; + /* 0x08 */ u32 cuteRibbon:3; + /* 0x09 */ u32 smartRibbon:3; + /* 0x09 */ u32 toughRibbon:3; + /* 0x09 */ u32 championRibbon:1; + /* 0x0A */ u32 winningRibbon:1; + /* 0x0A */ u32 victoryRibbon:1; + /* 0x0A */ u32 artistRibbon:1; + /* 0x0A */ u32 effortRibbon:1; + /* 0x0A */ u32 giftRibbon1:1; + /* 0x0A */ u32 giftRibbon2:1; + /* 0x0A */ u32 giftRibbon3:1; + /* 0x0A */ u32 giftRibbon4:1; + /* 0x0B */ u32 giftRibbon5:1; + /* 0x0B */ u32 giftRibbon6:1; + /* 0x0B */ u32 giftRibbon7:1; + /* 0x0B */ u32 fatefulEncounter:5; // unused in Ruby/Sapphire, but the high bit must be set for Mew/Deoxys to obey in FR/LG/Emerald }; union PokemonSubstruct |