diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-25 00:23:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-06-25 00:26:50 -0400 |
| commit | 2cae14cf5ae83831d5c387b3823de34d8d476908 (patch) | |
| tree | b776589bf88596d7280011c3ea1d9befd32b287f /include/global.h | |
| parent | 3300def3b39752f9f290f10dbf0cf7748f0dec5b (diff) | |
| parent | e72babd734ab7fd4e5c6d29f456b82d5e76e1bde (diff) | |
Merge remote-tracking branch 'origin/master' into de/integrate-data-includes
Conflicts:
asm/battle_anim_8137220.s
asm-de/battle_message.s
Diffstat (limited to 'include/global.h')
| -rwxr-xr-x | include/global.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h index 9da4bd57c..d172cfa25 100755 --- a/include/global.h +++ b/include/global.h @@ -625,10 +625,11 @@ struct Pokedex struct SaveBlock2_Sub { - /*0x0000, 0x00A4*/ u8 filler_000[0x3D8]; + /*0x0000, 0x00A8*/ u8 filler_000[0x3D8]; /*0x03D8, 0x0480*/ u16 var_480; /*0x03DA, 0x0482*/ u16 var_482; - /*0x03DC, 0x0484*/ u8 filler_3DC[0xD1]; + /*0x03DC, 0x0484*/ u8 filler_3DC[0xD0]; + /*0x04AC, 0x0554*/ u8 var_4AC; /*0x04AD, 0x0555*/ u8 var_4AD; /*0x04AE, 0x0556*/ u8 var_4AE; /*0x04AF, 0x0557*/ u8 var_4AF; |