diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-08-24 15:19:55 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-08-24 15:19:55 -0500 |
| commit | 1ae38be0a46d1d901a2d9e5bb22938a0cecf6b7f (patch) | |
| tree | 2cc4a2c40fb21bbee0f2d19cee33a00e6b207a7b /include | |
| parent | a277e60789d9ea78fe03a4bcded2edf7b91e548e (diff) | |
do some renaming and reorganizing
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 8 | ||||
| -rw-r--r-- | include/mauville_old_man.h | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/global.h b/include/global.h index f172c12a3..32a6beb2b 100644 --- a/include/global.h +++ b/include/global.h @@ -464,7 +464,7 @@ struct MauvilleManBard /*0x1A*/ u8 playerName[8]; /*0x22*/ u8 filler_2DB6[0x3]; /*0x25*/ u8 playerTrainerId[4]; - /*0x29*/ u8 unk_2DBD; + /*0x29*/ bool8 hasChangedSong; }; /*size = 0x2C*/ struct MauvilleManHipster @@ -502,7 +502,7 @@ struct MauvilleManGiddy }; /*size = 0x2C*/ -typedef union OldMan +union MauvilleMan { struct MauvilleManCommon common; struct MauvilleManBard bard; @@ -511,7 +511,7 @@ typedef union OldMan struct MauvilleManStoryteller storyteller; struct MauvilleManGiddy giddy; u8 filler[0x40]; -} OldMan; +}; struct Unk_SB_Access_Struct1 { @@ -668,7 +668,7 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2B4C*/ struct MailStruct mail[16]; /*0x2D8C*/ u8 unk2D8C[4]; /*0x2D90*/ u8 filler_2D90[0x4]; - /*0x2D94*/ OldMan oldMan; + /*0x2D94*/ union MauvilleMan mauvilleMan; /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff /*0x2DFC*/ u8 filler_2DFC[0x8]; /*0x2E04*/ SB_Struct sbStruct; diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h index 43bf3e093..277e5fbe6 100644 --- a/include/mauville_old_man.h +++ b/include/mauville_old_man.h @@ -14,7 +14,6 @@ enum void SetupMauvilleOldMan(void); void sub_80F7DC0(void); void sub_80F7F30(void); -void sub_80F7F80(u8); void sub_80F83D0(void); #endif // GUARD_MAUVILLE_OLD_MAN_H |