diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-19 19:57:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-19 19:57:31 -0600 |
| commit | 48d7c0a7a389479727b771361132871ca99f9087 (patch) | |
| tree | fb6bac591e74f1d867e59b5bf5b2ca7a01ad6f2e /src/battle_main.c | |
| parent | 5b73fe138cf06f176ca2c2184b8ea004acb9545b (diff) | |
| parent | d6589d1abc29516fe1afe0aed4105d0dabc81778 (diff) | |
Merge pull request #454 from golemgalvanize/decompile_party_menu
Decompile party menu
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 16025a455..42f204508 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4,6 +4,7 @@ #include "battle_arena.h" #include "battle_controllers.h" #include "battle_interface.h" +#include "battle_main.h" #include "battle_message.h" #include "battle_pyramid.h" #include "battle_scripts.h" @@ -55,20 +56,6 @@ #include "constants/species.h" #include "constants/trainers.h" -struct UnknownPokemonStruct4 -{ - /*0x00*/ u16 species; - /*0x02*/ u16 heldItem; - /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; - /*0x0F*/ u8 level; - /*0x10*/ u16 hp; - /*0x12*/ u16 maxhp; - /*0x14*/ u32 status; - /*0x18*/ u32 personality; - /*0x1C*/ u8 gender; - /*0x1D*/ u8 language; -}; - extern struct MusicPlayerInfo gMPlayInfo_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE2; extern u8 gUnknown_0203CF00[]; |