From 21c3e7e8e5555af964f7419aa9213446eaa421d6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 2 May 2018 11:31:58 -0400 Subject: through SetMauvilleOldMan --- include/global.h | 62 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 19 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index f88203c90..d3506d345 100644 --- a/include/global.h +++ b/include/global.h @@ -428,28 +428,50 @@ struct MailStruct /*0x20*/ u16 itemId; }; -struct UnkMauvilleOldManStruct -{ - u8 unk_2D94; - u8 unk_2D95; - /*0x2D96*/ u16 mauvilleOldMan_ecArray[6]; - /*0x2DA2*/ u16 mauvilleOldMan_ecArray2[6]; - /*0x2DAE*/ u8 playerName[8]; - /*0x2DB6*/ u8 filler_2DB6[0x3]; - /*0x2DB9*/ u8 playerTrainerId[4]; - u8 unk_2DBD; +struct MauvilleManCommon +{ + u8 id; +}; + +struct MauvilleManBard +{ + /*0x00*/ u8 id; + /*0x02*/ u16 songLyrics[6]; + /*0x0E*/ u16 temporaryLyrics[6]; + /*0x1A*/ u8 playerName[8]; + /*0x22*/ u8 filler_2DB6[0x3]; + /*0x25*/ u8 playerTrainerId[4]; + /*0x29*/ bool8 hasChangedSong; + /*0x2A*/ u8 language; }; /*size = 0x2C*/ -struct UnkMauvilleOldManStruct2 +struct MauvilleManStoryteller { - u8 filler0; - u8 unk1; - u8 unk2; - u16 mauvilleOldMan_ecArray[10]; - u8 mauvilleOldMan_ecArray2[12]; - u8 fillerF[0x2]; + u8 id; + bool8 alreadyRecorded; + u8 filler2[2]; + u8 gameStatIDs[4]; + u8 trainerNames[4][7]; + u8 statValues[4][4]; +}; + +struct MauvilleManGiddy +{ + /*0x00*/ u8 id; + /*0x01*/ u8 taleCounter; + /*0x02*/ u8 questionNum; + /*0x04*/ u16 randomWords[10]; + /*0x18*/ u8 questionList[8]; + /*0x20*/ u8 language; }; /*size = 0x2C*/ +struct MauvilleManHipster +{ + u8 id; + bool8 alreadySpoken; + u8 language; +}; + struct MauvilleOldManTrader { u8 unk0; @@ -460,8 +482,10 @@ struct MauvilleOldManTrader typedef union OldMan { - struct UnkMauvilleOldManStruct oldMan1; - struct UnkMauvilleOldManStruct2 oldMan2; + struct MauvilleManCommon common; + struct MauvilleManBard bard; + struct MauvilleManGiddy giddy; + struct MauvilleManHipster hipster; struct MauvilleOldManTrader trader; u8 filler[0x40]; } OldMan; -- cgit v1.2.3 From c6115a2fec2955803e65eedf5e8de1b8a134c188 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 3 May 2018 17:03:52 -0400 Subject: through sub_8120C0C --- include/global.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index d3506d345..083ed3e9f 100644 --- a/include/global.h +++ b/include/global.h @@ -453,6 +453,7 @@ struct MauvilleManStoryteller u8 gameStatIDs[4]; u8 trainerNames[4][7]; u8 statValues[4][4]; + u8 unk34[4]; }; struct MauvilleManGiddy @@ -478,6 +479,7 @@ struct MauvilleOldManTrader u8 unk1[4]; u8 unk5[4][11]; u8 unk31; + u8 unk32[4]; }; typedef union OldMan @@ -487,6 +489,7 @@ typedef union OldMan struct MauvilleManGiddy giddy; struct MauvilleManHipster hipster; struct MauvilleOldManTrader trader; + struct MauvilleManStoryteller storyteller; u8 filler[0x40]; } OldMan; -- cgit v1.2.3 From 61cc1d55743715a64e793187f63d0f1f7a80b0e0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 7 May 2018 18:11:20 -0400 Subject: Rename symbols using Ruby as a reference --- include/global.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index 083ed3e9f..0c50bf39c 100644 --- a/include/global.h +++ b/include/global.h @@ -453,7 +453,7 @@ struct MauvilleManStoryteller u8 gameStatIDs[4]; u8 trainerNames[4][7]; u8 statValues[4][4]; - u8 unk34[4]; + u8 language[4]; }; struct MauvilleManGiddy @@ -477,9 +477,9 @@ struct MauvilleOldManTrader { u8 unk0; u8 unk1[4]; - u8 unk5[4][11]; + u8 playerNames[4][11]; u8 unk31; - u8 unk32[4]; + u8 language[4]; }; typedef union OldMan -- cgit v1.2.3