diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2016-11-04 21:21:42 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-11-04 19:21:42 -0700 |
| commit | 4d4f1b51384d57db93cd3344b2964106f8620f4f (patch) | |
| tree | fe11e744a9c4f3c9805994469a70b87740680354 /include | |
| parent | c9816e5ace6cac28e7747c1bc46160876e02879b (diff) | |
Big shroomish barboach (#87)
* start decompiling
* decompile more functions
* clean up and rename big_shroomish_barboach.c to pokemon_size_record.c
* remove save file
* remove extraneous line from Makefile
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 4 | ||||
| -rw-r--r-- | include/pokemon.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index 197420dd3..e90a5797e 100644 --- a/include/global.h +++ b/include/global.h @@ -234,7 +234,9 @@ struct SaveBlock1 /*0x2EFC*/ struct SB1_2EFC_Struct sb1_2EFC_struct[5]; /*0x2F9C*/ u8 filler_2F9C[0xA0]; /*0x303C*/ u8 filler_303C[0x38]; - /*0x3074*/ u8 filler_3074[0xD0]; + /*0x3074*/ u8 filler_3074[0x9C]; + /*0x3110*/ u8 giftRibbons[7]; + /*0x3117*/ u8 filler_311B[0x2D]; /*0x3144*/ struct Roamer roamer; /*0x3158*/ u8 filler_3158[0x8]; /*0x3160*/ struct EnigmaBerry enigmaBerry; diff --git a/include/pokemon.h b/include/pokemon.h index 43ff1b500..219447f8f 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -337,6 +337,9 @@ struct PokemonStorage struct BoxPokemon boxes[14][30]; }; +extern struct Pokemon gPlayerParty[6]; +extern struct Pokemon gEnemyParty[6]; + void ZeroBoxMonData(struct BoxPokemon *boxMon); void ZeroMonData(struct Pokemon *mon); void ZeroPlayerPartyMons(void); |