diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-05-30 16:51:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 16:51:30 -0700 |
| commit | dd28854a226753e2da53b35dcf1f67b142b75b77 (patch) | |
| tree | 61864daf48aad5dfcf697c36e8acac88ce9f4d4c /include/mauville_old_man.h | |
| parent | f6350bc00373dc824a02522b6c6c9e4695534884 (diff) | |
| parent | 42731e4b88115bada3aed8ebc3b2c3dabecbb020 (diff) | |
Merge pull request #255 from DizzyEggg/decomp_record_mixing
Fix pika's Record Mixing PR
Also closes #107.
Diffstat (limited to 'include/mauville_old_man.h')
| -rw-r--r-- | include/mauville_old_man.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h index 696f12cc7..e318ac8bb 100644 --- a/include/mauville_old_man.h +++ b/include/mauville_old_man.h @@ -11,9 +11,16 @@ enum MauvilleOldManType MAUVILLE_MAN_GIDDY }; +extern struct BardSong gBardSong; + void SetMauvilleOldMan(void); u8 GetCurrentMauvilleOldMan(void); -extern struct BardSong gBardSong; void ScrSpecial_SetMauvilleOldManMapObjGfx(void); +u8 sub_81201C8(void); +void sub_8120B70(OldMan *dest); +void sub_8120670(void); +void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 r1, u32 r6); +void SanitizeReceivedEmeraldOldMan(union OldMan * oldMan, u32 unused, u32 a2); +void ResetMauvilleOldManFlag(void); #endif // GUARD_MAUVILLE_OLD_MAN_H |