summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-04-23 22:16:06 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-04-23 22:16:06 -0400
commit9b650159461c2538fc366364465f54c938ff79cc (patch)
treee046c4b4f39afc4c52abb4da8fef8c092d0e261e /include/global.h
parente43d716b3edc723d882af3e18f8e50b0b5a3f61c (diff)
parent4ed28757fdc51de0da47809fab9f5be40cfe3423 (diff)
Merge branch 'master' into pokedex_area_screen
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h
index 38ba50a2c..82c4916bd 100644
--- a/include/global.h
+++ b/include/global.h
@@ -698,9 +698,16 @@ struct SaveBlock1 /* 0x02025734 */
/*0x2EFC*/ struct ContestWinner museumPortraits[5];
/*0x2F9C*/ struct DayCare daycare;
/*0x30B8*/ struct LinkBattleRecord linkBattleRecords[5];
- /*0x3108*/ u8 filler_3108[8];
- /*0x3110*/ u8 giftRibbons[11];
- /*0x3117*/ u8 filler_311B[0x29];
+ struct {
+ /*0x3108*/ u8 unknown1[8];
+ /*0x3110*/ u8 giftRibbons[11];
+ /*0x311B*/ u8 unknown2[8];
+ /*0x3123*/ u32 currentPokeCoupons;
+ /*0x3127*/ u32 totalEarnedPokeCoupons;
+ /*0x312B*/ u8 unknown3[6];
+ /*0x3131*/ u8 receivedWishmakerJirachi;
+ /*0x3132*/ u8 unknown4[18];
+ } __attribute__((packed)) externalReservedData;
/*0x3144*/ struct Roamer roamer;
/*0x3160*/ struct EnigmaBerry enigmaBerry;
/*0x3690*/ struct RamScript ramScript;