diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-20 14:01:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 14:01:40 -0500 |
| commit | afd42c8e145c77fbf07799a54aec405766eed45c (patch) | |
| tree | cb7c42df376be690f6777ec9a843472f20d0efeb /include | |
| parent | d2cf86bff9792db39ca4f1288dc083ca8018a62e (diff) | |
| parent | 31e0b468c7f859e72e758f3f0fc1051ab887d9a5 (diff) | |
Merge pull request #92 from DizzyEggg/decompile_walda_phrase
decompile walda phrase
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 12 | ||||
| -rw-r--r-- | include/naming_screen.h | 2 | ||||
| -rw-r--r-- | include/new_game.h | 1 | ||||
| -rw-r--r-- | include/walda_phrase.h | 8 |
4 files changed, 21 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h index 58a0d79dc..d8547d9c3 100644 --- a/include/global.h +++ b/include/global.h @@ -500,6 +500,16 @@ typedef union // TODO u8 id; } LilycoveLady; +struct WaldaPhrase +{ + u16 field_0; + u16 field_2; + u8 text[16]; + u8 iconId; + u8 patternId; + bool8 patternUnlocked; +}; + struct SaveBlock1 { /*0x00*/ struct Coords16 pos; @@ -586,7 +596,7 @@ struct SaveBlock1 /*0x3B24*/ u8 seen2[52]; /*0x3B58*/ LilycoveLady lilycoveLady; /*0x3B88*/ u8 filler_3B88[0x1E8]; - /*0x3D70*/ u8 babyPhrase[24]; // TODO: convert to a struct + /*0x3D70*/ struct WaldaPhrase waldaPhrase; // sizeof: 0x3D88 }; diff --git a/include/naming_screen.h b/include/naming_screen.h index 55a8e75a3..3d69b834f 100644 --- a/include/naming_screen.h +++ b/include/naming_screen.h @@ -5,7 +5,7 @@ #define NAMING_SCREEN_BOX 1 #define NAMING_SCREEN_CAUGHT_MON 2 #define NAMING_SCREEN_3 3 -#define NAMING_SCREEN_WANDA 4 +#define NAMING_SCREEN_WALDA 4 void DoNamingScreen(u8 caseId, u8* dst, u16 monSpecies, u8 monGender, u32 monPersonality, void (*callback)(void)); diff --git a/include/new_game.h b/include/new_game.h index 060279c25..2088d1826 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -2,6 +2,7 @@ #define GUARD_NEW_GAME_H void WriteUnalignedWord(u32 var, u8 *dataPtr); +u32 ReadUnalignedWord(u8* dataPtr); void CopyUnalignedWord(u8 *copyTo, u8 *copyFrom); void InitPlayerTrainerId(void); void SetDefaultOptions(void); diff --git a/include/walda_phrase.h b/include/walda_phrase.h new file mode 100644 index 000000000..3d7701123 --- /dev/null +++ b/include/walda_phrase.h @@ -0,0 +1,8 @@ +#ifndef GUARD_WALDA_PHRASE_H +#define GUARD_WALDA_PHRASE_H + +u16 TryBufferWaldaPhrase(void); +void DoWaldaNamingScreen(void); +u16 TryGetWallpaperWithWaldaPhrase(void); + +#endif // GUARD_WALDA_PHRASE_H |