diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-10-01 21:38:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-01 21:38:28 -0700 |
| commit | 3776a9fb4f0531535b0b5879dab7b3b6bd231736 (patch) | |
| tree | 8361facfccf7a68ff6b13c6a7b22771a4cf9d585 /include/global.h | |
| parent | 50dc4f429d4aa68e0365adc71d17e43a0dd7b843 (diff) | |
| parent | 97d2b14422fae0c8bc30440d136e86778a122964 (diff) | |
Merge pull request #427 from PikalaxALT/trade
decompile trade.s
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h index f017612f0..f0eb7401f 100644 --- a/include/global.h +++ b/include/global.h @@ -695,8 +695,8 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2F9C*/ struct DayCareData daycareData; /*0x30B8*/ struct LinkBattleRecord linkBattleRecords[5]; /*0x3108*/ u8 filler_3108[8]; - /*0x3110*/ u8 giftRibbons[7]; - /*0x3117*/ u8 filler_311B[0x2D]; + /*0x3110*/ u8 giftRibbons[11]; + /*0x3117*/ u8 filler_311B[0x29]; /*0x3144*/ struct Roamer roamer; /*0x3160*/ struct EnigmaBerry enigmaBerry; /*0x3690*/ struct RamScript ramScript; |