diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-01-31 03:08:44 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-31 00:08:44 -0800 |
| commit | 9813caaf5345ea28f8230d41461618673779c2fb (patch) | |
| tree | 53b692aabb235c2f5a58060fa134bbdb3adbb67b /include/global.h | |
| parent | b6b5453431af46791fd9d211efac64464c1dff85 (diff) | |
make ROM match again (#227)
* some labels and enumerate player speeds
* clear up speed enums
* GetPlayerSpeed
* oops
* start decompiling mauville_old_man.c
* formatting
* decompile more of mauville_old_man.c
* someone fix this please
* formatting
* make ROM build again
* formatting again
* make ROM match again
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/global.h b/include/global.h index 6c8b60484..56338a9e8 100644 --- a/include/global.h +++ b/include/global.h @@ -276,7 +276,7 @@ struct UnkMauvilleOldManStruct /*0x2DB6*/ u8 filler_2DB6[0x3]; /*0x2DB9*/ u8 playerTrainerId[4]; u8 unk_2DBD; - /* size = 0x1E */ + /* size = 0x2C */ }; struct UnkMauvilleOldManStruct2 @@ -286,8 +286,8 @@ struct UnkMauvilleOldManStruct2 u8 unk2; u16 mauvilleOldMan_ecArray[10]; u16 mauvilleOldMan_ecArray2[6]; - u8 fillerF[0x4]; - /* size = 0x1E */ + u8 fillerF[0x2]; + /* size = 0x2C */ }; typedef union OldMan { @@ -361,9 +361,8 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2B24*/ u8 filler_2B24[0x28]; /*0x2B4C*/ struct MailStruct mail[16]; /*0x2D8C*/ u8 filler_2D8C[0x8]; - OldMan oldMan; - ///*0x2D94*/ struct UnkMauvilleOldManStruct oldManStruct; - /*0x2DBC*/ u8 filler_2DBC[0x18]; + /*0x2D94*/ OldMan oldMan; + /*0x2DC0*/ u8 unk_2DC0[0x14]; /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff /*0x2DFC*/ u8 filler_2DFC[0x100]; /*0x2EFC*/ struct SB1_2EFC_Struct sb1_2EFC_struct[5]; |