From cda5c5f925024acca194837007b9f88597ce4db8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 20 Oct 2017 18:52:01 +0200
Subject: start working on walda phrase

---
 include/global.h        | 12 +++++++++++-
 include/naming_screen.h |  2 +-
 include/new_game.h      |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'include')

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);
-- 
cgit v1.2.3


From 8c85a273461557bde4b42630ba3a56701c8f4d81 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 20 Oct 2017 20:39:00 +0200
Subject: walda phrase is done

---
 include/walda_phrase.h | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 include/walda_phrase.h

(limited to 'include')

diff --git a/include/walda_phrase.h b/include/walda_phrase.h
new file mode 100644
index 000000000..7a711a413
--- /dev/null
+++ b/include/walda_phrase.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_WALDA_PHRASE_H
+#define GUARD_WALDA_PHRASE_H
+
+void DoWaldaNamingScreen(void);
+u16 TryGetWallpaperWithWaldaPhrase(void);
+
+#endif // GUARD_WALDA_PHRASE_H
-- 
cgit v1.2.3


From 31e0b468c7f859e72e758f3f0fc1051ab887d9a5 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 20 Oct 2017 20:46:26 +0200
Subject: move from raq scene to walda phrase

---
 include/walda_phrase.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/walda_phrase.h b/include/walda_phrase.h
index 7a711a413..3d7701123 100644
--- a/include/walda_phrase.h
+++ b/include/walda_phrase.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_WALDA_PHRASE_H
 #define GUARD_WALDA_PHRASE_H
 
+u16 TryBufferWaldaPhrase(void);
 void DoWaldaNamingScreen(void);
 u16 TryGetWallpaperWithWaldaPhrase(void);
 
-- 
cgit v1.2.3