diff options
Diffstat (limited to 'gba/source/saveblocks.h')
-rw-r--r-- | gba/source/saveblocks.h | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/gba/source/saveblocks.h b/gba/source/saveblocks.h index cf0a5c3..7879cd1 100644 --- a/gba/source/saveblocks.h +++ b/gba/source/saveblocks.h | |||
@@ -82,9 +82,9 @@ typedef struct | |||
82 | /*0x303C*/ u8 filler_303C[0x38]; | 82 | /*0x303C*/ u8 filler_303C[0x38]; |
83 | /*0x3074*/ u8 filler_3074[0x42]; | 83 | /*0x3074*/ u8 filler_3074[0x42]; |
84 | /*0x30B6*/ u8 filler_30B6; | 84 | /*0x30B6*/ u8 filler_30B6; |
85 | /*0x30B7*/ u8 filler_30B7[0x59]; | 85 | /*0x30B7*/ u8 filler_30B7[0x5B]; |
86 | /*0x3110*/ u8 giftRibbons[7]; | 86 | /*0x3112*/ u8 giftRibbons[7]; |
87 | /*0x3117*/ u8 filler_311B[0x2D]; | 87 | /*0x3119*/ u8 filler_311B[0x2B]; |
88 | /*0x3144*/ struct Roamer roamer; | 88 | /*0x3144*/ struct Roamer roamer; |
89 | /*0x3158*/ u8 filler_3158[0x8]; | 89 | /*0x3158*/ u8 filler_3158[0x8]; |
90 | /*0x3160*/ struct EnigmaBerry enigmaBerry; // this is actually offset by 0x98 ... | 90 | /*0x3160*/ struct EnigmaBerry enigmaBerry; // this is actually offset by 0x98 ... |
@@ -103,24 +103,23 @@ typedef struct // Don't rely on the commented offsets, they'll be wrong due to e | |||
103 | /*0x2F*/ u8 filler_2F; | 103 | /*0x2F*/ u8 filler_2F; |
104 | /*0x30*/ u8 flashUsed; | 104 | /*0x30*/ u8 flashUsed; |
105 | /*0x32*/ u16 mapDataId; | 105 | /*0x32*/ u16 mapDataId; |
106 | // /*0x34*/ u16 mapView[0x100]; // Not in fr/lg | 106 | /*0x34*/ u8 playerPartyCount; |
107 | /*0x234*/ u8 playerPartyCount; | 107 | /*0x38*/ struct Pokemon playerParty[6]; |
108 | /*0x238*/ struct Pokemon playerParty[6]; | 108 | /*0x290*/ u32 money; |
109 | /*0x490*/ u32 money; | 109 | /*0x294*/ u16 coins; |
110 | /*0x494*/ u16 coins; | 110 | /*0x296*/ u16 registeredItem; // registered for use with SELECT button |
111 | /*0x496*/ u16 registeredItem; // registered for use with SELECT button | 111 | /*0x298*/ struct ItemSlot pcItems[30]; |
112 | /*0x498*/ struct ItemSlot pcItems[30]; | 112 | /*0x360*/ struct ItemSlot bagPocket_Items[42]; |
113 | /*0x560*/ struct ItemSlot bagPocket_Items[42]; | 113 | /*0x3B0*/ struct ItemSlot bagPocket_KeyItems[30]; |
114 | /*0x5B0*/ struct ItemSlot bagPocket_KeyItems[30]; | 114 | /*0x400*/ struct ItemSlot bagPocket_PokeBalls[13]; |
115 | /*0x600*/ struct ItemSlot bagPocket_PokeBalls[13]; | 115 | /*0x440*/ struct ItemSlot bagPocket_TMHM[58]; |
116 | /*0x640*/ struct ItemSlot bagPocket_TMHM[58]; | 116 | /*0x540*/ struct ItemSlot bagPocket_Berries[43]; |
117 | /*0x740*/ struct ItemSlot bagPocket_Berries[43]; | 117 | /*0x5EA*/ u8 unk938[52]; // pokedex related |
118 | // /*0x7F8*/ struct Pokeblock pokeblocks[40]; // Not in fr/lg | 118 | /*0x61E*/ u8 unk_62C[12]; |
119 | /*0x938*/ u8 unk938[52]; // pokedex related | 119 | /*0x62A*/ u8 filler_972[0x6]; |
120 | /*0x96C*/ u8 unk_62C[12]; | 120 | /*0x630*/ u8 unk_63E[98]; |
121 | /*0x972*/ u8 filler_972[0x6]; | 121 | /*0x692*/ struct MapObject mapObjects[16]; |
122 | /*0x97A*/ u8 unk_63E[98]; | 122 | // offsets are mostly wrong below here |
123 | /*0x9E0*/ struct MapObject mapObjects[16]; | ||
124 | /*0xC20*/ struct MapObjectTemplate mapObjectTemplates[64]; | 123 | /*0xC20*/ struct MapObjectTemplate mapObjectTemplates[64]; |
125 | /*0x1220*/ u8 flags[0x120]; | 124 | /*0x1220*/ u8 flags[0x120]; |
126 | /*0x1340*/ u16 vars[0x100]; | 125 | /*0x1340*/ u16 vars[0x100]; |
@@ -130,11 +129,13 @@ typedef struct // Don't rely on the commented offsets, they'll be wrong due to e | |||
130 | struct NPCState npc_states[0x10]; | 129 | struct NPCState npc_states[0x10]; |
131 | u8 unk_2f10[112]; | 130 | u8 unk_2f10[112]; |
132 | struct DaycarePokemon daycare[2]; | 131 | struct DaycarePokemon daycare[2]; |
133 | u8 unk_3098[56]; | 132 | u8 unk_3098[4]; |
133 | u8 giftRibbons[7]; | ||
134 | u8 unk_30A3[45]; | ||
134 | struct Roamer roamer; | 135 | struct Roamer roamer; |
135 | u8 unk_30e4[8]; | 136 | u8 unk_30e4[8]; |
136 | /*0x3160*/ struct EnigmaBerryFRLGE enigmaBerry; | 137 | /*0x3160*/ struct EnigmaBerryFRLGE enigmaBerry; |
137 | u8 unk_3120[0x1C0]; // 4 bytes of CRC16, then 444 bytes of unknown. Mystery Gift related. | 138 | u8 unk_3120[0x1C0]; // 4 bytes of CRC16, then 444 bytes of unknown. Mystery Gift related. |
138 | u8 unk_32E0[0x150]; // 4 bytes of CRC16, then 332 bytes of unknown. Mystery Gift related. "mevent_buffer_1" | 139 | u8 unk_32E0[0x150]; // 4 bytes of CRC16, then 332 bytes of unknown. Mystery Gift related. "mevent_buffer_1" |
139 | u8 unk_3430[0x150]; // 4 bytes of CRC16, then 332 bytes of unknown. Mystery Gift related. "mevent_buffer_2" | 140 | u8 unk_3430[0x150]; // 4 bytes of CRC16, then 332 bytes of unknown. Mystery Gift related. "mevent_buffer_2" |
140 | u8 unk_368C[0x9C]; // padding? doesn't seem to be actually used | 141 | u8 unk_368C[0x9C]; // padding? doesn't seem to be actually used |
@@ -215,9 +216,9 @@ typedef struct // Don't rely on the commented offsets, they'll be wrong due to e | |||
215 | /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff | 216 | /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff |
216 | // /*0x2DFC*/ u8 filler_2DFC[0x100]; | 217 | // /*0x2DFC*/ u8 filler_2DFC[0x100]; |
217 | /*0x2EFC*/ struct SB1_2EFC_Struct sb1_2EFC_struct[12]; | 218 | /*0x2EFC*/ struct SB1_2EFC_Struct sb1_2EFC_struct[12]; |
218 | u8 unk_3010[0x198]; // no idea if any of this is actually used. | 219 | u8 unk_3010[0x19A]; // no idea if any of this is actually used. |
219 | /*0x3110*/ u8 giftRibbons[7]; | 220 | /*0x310E*/ u8 giftRibbons[7]; |
220 | /*0x3117*/ u8 filler_311B[0x2D]; | 221 | /*0x3115*/ u8 filler_311B[0x2B]; |
221 | /*0x3144*/ struct Roamer roamer; | 222 | /*0x3144*/ struct Roamer roamer; |
222 | /*0x3158*/ u8 filler_3158[0x8]; | 223 | /*0x3158*/ u8 filler_3158[0x8]; |
223 | /*0x3160*/ struct EnigmaBerryFRLGE enigmaBerry; | 224 | /*0x3160*/ struct EnigmaBerryFRLGE enigmaBerry; |