Document easy chat screen types

This commit is contained in:
Marcus Huderle 2019-02-27 12:45:31 -06:00 committed by huderlem
parent 231355f84d
commit 4b9e93850c
22 changed files with 963 additions and 927 deletions

View File

@ -1,6 +1,7 @@
#include "constants/global.h" #include "constants/global.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/battle_setup.h" #include "constants/battle_setup.h"
#include "constants/easy_chat.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h" #include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
@ -1683,18 +1684,9 @@ Common_EventScript_ShowPokemonCenterSign:: @ 8271E73
msgbox gText_PokemonCenterSign, MSGBOX_SIGN msgbox gText_PokemonCenterSign, MSGBOX_SIGN
end end
BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C Common_ShowEasyChatScreen:: @ 8271E7C
DewfordTown_EventScript_271E7C:: @ 8271E7C
LilycoveCity_ContestLobby_EventScript_271E7C:: @ 8271E7C
LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C:: @ 8271E7C
MauvilleCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C
PetalburgCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C
Route111_EventScript_271E7C:: @ 8271E7C
Route123_BerryMastersHouse_EventScript_271E7C:: @ 8271E7C
SlateportCity_OceanicMuseum_1F_EventScript_271E7C:: @ 8271E7C
SlateportCity_PokemonFanClub_EventScript_271E7C:: @ 8271E7C
fadescreen 1 fadescreen 1
special easy_chat_input_maybe special ShowEasyChatScreen
fadescreen 0 fadescreen 0
return return
@ -2941,8 +2933,8 @@ EventScript_Questionnaire:: @ 827381B
msgbox gUnknown_0827339F, MSGBOX_YESNO msgbox gUnknown_0827339F, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq EventScript_2738FD goto_if_eq EventScript_2738FD
setvar VAR_0x8004, 20 setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
call MauvilleCity_PokemonCenter_1F_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
specialvar VAR_0x8008, sub_813B490 specialvar VAR_0x8008, sub_813B490
@ -3769,10 +3761,10 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0
SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827
msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT
setvar VAR_0x8004, 5 setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 1 setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE
call SlateportCity_PokemonFanClub_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@ -3824,10 +3816,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8
SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7
msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT
setvar VAR_0x8004, 5 setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 0 setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE
call SlateportCity_OceanicMuseum_1F_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@ -3896,17 +3888,17 @@ SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF
end end
SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED
setvar VAR_0x8004, 7 setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
call SlateportCity_PokemonFanClub_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45
msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
call SlateportCity_PokemonFanClub_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@ -3945,10 +3937,10 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59
LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B
msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT
setvar VAR_0x8004, 11 setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
call LilycoveCity_ContestLobby_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@ -3966,10 +3958,10 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA
setvar VAR_0x8004, 24 setvar VAR_0x8004, 24
special SetContestCategoryStringVarForInterview special SetContestCategoryStringVarForInterview
msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT
setvar VAR_0x8004, 11 setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
call LilycoveCity_ContestLobby_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@ -4034,9 +4026,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41
msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT
setvar VAR_0x8004, 12 setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009 copyvar VAR_0x8005, VAR_0x8009
call BattleFrontier_BattleTowerLobby_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@ -4506,7 +4498,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C
special sub_818E3BC special sub_818E3BC
compare VAR_0x8004, 0 compare VAR_0x8004, 0
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C
compare VAR_0x8004, 15 compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656
LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635 LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635

View File

@ -572,8 +572,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7
BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT
setvar VAR_0x8004, 1 setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_START
call BattleFrontier_BattleTowerLobby_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
@ -581,8 +581,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT
setvar VAR_0x8004, 2 setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_WON
call BattleFrontier_BattleTowerLobby_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
@ -590,8 +590,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66
msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT
setvar VAR_0x8004, 3 setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_LOST
call BattleFrontier_BattleTowerLobby_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A

View File

@ -608,8 +608,8 @@ DewfordTown_EventScript_1E9948:: @ 81E9948
DewfordTown_EventScript_1E9952:: @ 81E9952 DewfordTown_EventScript_1E9952:: @ 81E9952
msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT
setvar VAR_0x8004, 9 setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE
call DewfordTown_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1

View File

@ -512,9 +512,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special BufferStreakTrainerText special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT
setvar VAR_0x8004, 14 setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@ -542,9 +542,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special BufferStreakTrainerText special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT
setvar VAR_0x8004, 14 setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1

View File

@ -41,8 +41,8 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0
dotimebasedevents dotimebasedevents
goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F
msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT
setvar VAR_0x8004, 13 setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING
call Route123_BerryMastersHouse_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 1 compare VAR_RESULT, 1

View File

@ -269,8 +269,8 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
apprentice_msg TRUE, 11 apprentice_msg TRUE, 11
setvar VAR_0x8004, 25 setvar VAR_0x8004, 25
special CallApprenticeFunction special CallApprenticeFunction
setvar VAR_0x8004, 19 setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE
call BattleFrontier_BattleTowerLobby_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 21 setvar VAR_0x8004, 21

View File

@ -313,8 +313,8 @@ Route111_EventScript_28D0A7:: @ 828D0A7
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route111_EventScript_28D0E1 goto_if_eq Route111_EventScript_28D0E1
msgbox Route111_Text_28B433, MSGBOX_DEFAULT msgbox Route111_Text_28B433, MSGBOX_DEFAULT
setvar VAR_0x8004, 10 setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY
call Route111_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 0 compare VAR_RESULT, 0

View File

@ -43,8 +43,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4
end end
MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113
setvar VAR_0x8004, 6 setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG
call MauvilleCity_PokemonCenter_1F_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 0 compare VAR_RESULT, 0

View File

@ -24,8 +24,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591
PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F
msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_0x8004, 0 setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
call PetalburgCity_PokemonCenter_1F_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@ -76,8 +76,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642
PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650
msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_0x8004, 0 setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
call PetalburgCity_PokemonCenter_1F_EventScript_271E7C call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, 0 compare VAR_RESULT, 0

View File

@ -106,7 +106,7 @@ gSpecials:: @ 81DBA64
def_special sub_80B3000 def_special sub_80B3000
def_special SaveGame def_special SaveGame
def_special DoWateringBerryTreeAnim def_special DoWateringBerryTreeAnim
def_special easy_chat_input_maybe def_special ShowEasyChatScreen
def_special sub_811EECC def_special sub_811EECC
def_special ScrSpecial_GetCurrentMauvilleMan def_special ScrSpecial_GetCurrentMauvilleMan
def_special ScrSpecial_HasBardSongBeenChanged def_special ScrSpecial_HasBardSongBeenChanged

View File

Before

Width:  |  Height:  |  Size: 160 B

After

Width:  |  Height:  |  Size: 160 B

View File

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

View File

Before

Width:  |  Height:  |  Size: 147 B

After

Width:  |  Height:  |  Size: 147 B

View File

@ -1,6 +1,33 @@
#ifndef GUARD_CONSTANTS_EASY_CHAT_H #ifndef GUARD_CONSTANTS_EASY_CHAT_H
#define GUARD_CONSTANTS_EASY_CHAT_H #define GUARD_CONSTANTS_EASY_CHAT_H
#define EASY_CHAT_TYPE_PROFILE 0
#define EASY_CHAT_TYPE_BATTLE_START 1
#define EASY_CHAT_TYPE_BATTLE_WON 2
#define EASY_CHAT_TYPE_BATTLE_LOST 3
#define EASY_CHAT_TYPE_MAIL 4
#define EASY_CHAT_TYPE_INTERVIEW 5
#define EASY_CHAT_TYPE_BARD_SONG 6
#define EASY_CHAT_TYPE_FAN_CLUB 7
#define EASY_CHAT_TYPE_UNK_8 8
#define EASY_CHAT_TYPE_TRENDY_PHRASE 9
#define EASY_CHAT_TYPE_GABBY_AND_TY 10
#define EASY_CHAT_TYPE_CONTEST_INTERVIEW 11
#define EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW 12
#define EASY_CHAT_TYPE_GOOD_SAYING 13
#define EASY_CHAT_TYPE_FAN_QUESTION 14
#define EASY_CHAT_TYPE_QUIZ_ANSWER 15
#define EASY_CHAT_TYPE_QUIZ_QUESTION 16
#define EASY_CHAT_TYPE_QUIZ_SET_QUESTION 17
#define EASY_CHAT_TYPE_QUIZ_SET_ANSWER 18
#define EASY_CHAT_TYPE_APPRENTICE 19
#define EASY_CHAT_TYPE_QUESTIONNAIRE 20
#define EASY_CHAT_PERSON_REPORTER_MALE 0
#define EASY_CHAT_PERSON_REPORTER_FEMALE 1
#define EASY_CHAT_PERSON_BOY 2
#define EASY_CHAT_PERSON_DISPLAY_NONE 3
#define EC_GROUP_POKEMON 0x0 #define EC_GROUP_POKEMON 0x0
#define EC_GROUP_TRAINER 0x1 #define EC_GROUP_TRAINER 0x1
#define EC_GROUP_STATUS 0x2 #define EC_GROUP_STATUS 0x2

View File

@ -6,11 +6,11 @@
struct EasyChatScreenTemplate struct EasyChatScreenTemplate
{ {
u8 unk_00; u8 type;
u8 numColumns; u8 numColumns;
u8 numRows; u8 numRows;
u8 unk_03_0:7; u8 frameId:7;
u8 unk_03_7:1; u8 fourFooterOptions:1;
const u8 *titleText; const u8 *titleText;
const u8 *instructionsText1; const u8 *instructionsText1;
const u8 *instructionsText2; const u8 *instructionsText2;
@ -20,7 +20,7 @@ struct EasyChatScreenTemplate
struct EasyChatScreen struct EasyChatScreen
{ {
/*0x00*/ u8 kind; /*0x00*/ u8 type;
/*0x01*/ u8 templateId; /*0x01*/ u8 templateId;
/*0x02*/ u8 numColumns; /*0x02*/ u8 numColumns;
/*0x03*/ u8 numRows; /*0x03*/ u8 numRows;
@ -28,7 +28,7 @@ struct EasyChatScreen
/*0x05*/ s8 mainCursorColumn; /*0x05*/ s8 mainCursorColumn;
/*0x06*/ s8 mainCursorRow; /*0x06*/ s8 mainCursorRow;
/*0x07*/ u8 unk_07; /*0x07*/ u8 unk_07;
/*0x08*/ u8 unk_08; /*0x08*/ u8 stateBackup;
/*0x09*/ u8 unk_09; /*0x09*/ u8 unk_09;
/*0x0A*/ s8 unk_0a; /*0x0A*/ s8 unk_0a;
/*0x0B*/ s8 unk_0b; /*0x0B*/ s8 unk_0b;
@ -38,7 +38,7 @@ struct EasyChatScreen
/*0x0F*/ u8 unk_0f; /*0x0F*/ u8 unk_0f;
/*0x10*/ s8 unk_10; /*0x10*/ s8 unk_10;
/*0x11*/ s8 unk_11; /*0x11*/ s8 unk_11;
/*0x12*/ u8 sizeParam; /*0x12*/ u8 displayedPersonType;
/*0x13*/ u8 unk_13; /*0x13*/ u8 unk_13;
/*0x14*/ u8 unk_14[0x20]; /*0x14*/ u8 unk_14[0x20];
/*0x34*/ const u8 *titleText; /*0x34*/ const u8 *titleText;
@ -75,13 +75,13 @@ struct Unk203A11C
u16 unkB00[BG_SCREEN_SIZE / 2]; u16 unkB00[BG_SCREEN_SIZE / 2];
}; };
struct Unk08597C30 struct EasyChatPhraseFrameDimensions
{ {
u8 unk0_0:5; u8 left:5;
u8 unk0_5:3; u8 top:3;
u8 unk1; u8 width;
u8 unk2; u8 height;
u8 unk3; u8 footerId;
}; };
struct EasyChatWordInfo struct EasyChatWordInfo
@ -122,7 +122,7 @@ struct EasyChatWordsByLetter
}; };
void InitEasyChatPhrases(void); void InitEasyChatPhrases(void);
void easy_chat_input_maybe(void); void ShowEasyChatScreen(void);
u8 * CopyEasyChatWord(u8 *dest, u16 word); u8 * CopyEasyChatWord(u8 *dest, u16 word);
bool32 sub_811F8D8(int word); bool32 sub_811F8D8(int word);
void InitializeEasyChatWordArray(u16 *words, u16 length); void InitializeEasyChatWordArray(u16 *words, u16 length);
@ -132,7 +132,7 @@ u16 sub_811EE38(u16 group);
u16 sub_811F01C(void); u16 sub_811F01C(void);
u16 EasyChat_GetNumWordsInGroup(u8); u16 EasyChat_GetNumWordsInGroup(u8);
u16 sub_811EE90(u16); u16 sub_811EE90(u16);
void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam); void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType);
void sub_811F8BC(void); void sub_811F8BC(void);
#endif // GUARD_EASYCHAT_H #endif // GUARD_EASYCHAT_H

View File

@ -870,10 +870,10 @@ struct SaveBlock1
/*0x2BA1*/ u8 outbreakPokemonProbability; /*0x2BA1*/ u8 outbreakPokemonProbability;
/*0x2BA2*/ u16 outbreakDaysLeft; /*0x2BA2*/ u16 outbreakDaysLeft;
/*0x2BA4*/ struct GabbyAndTyData gabbyAndTyData; /*0x2BA4*/ struct GabbyAndTyData gabbyAndTyData;
/*0x2BB0*/ u16 unk2BB0[6]; /*0x2BB0*/ u16 easyChatProfile[6];
/*0x2BBC*/ u16 unk2BBC[6]; /*0x2BBC*/ u16 easyChatBattleStart[6];
/*0x2BC8*/ u16 unk2BC8[6]; /*0x2BC8*/ u16 easyChatBattleWon[6];
/*0x2BD4*/ u16 unk2BD4[6]; /*0x2BD4*/ u16 easyChatBattleLost[6];
/*0x2BE0*/ struct MailStruct mail[MAIL_COUNT]; /*0x2BE0*/ struct MailStruct mail[MAIL_COUNT];
/*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system
/*0x2E28*/ OldMan oldMan; /*0x2E28*/ OldMan oldMan;

View File

@ -2401,9 +2401,9 @@ static void sub_8163EE4(void)
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
{ {
playerRecord->greeting[i] = gSaveBlock1Ptr->unk2BBC[i]; playerRecord->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i];
playerRecord->speechWon[i] = gSaveBlock1Ptr->unk2BC8[i]; playerRecord->speechWon[i] = gSaveBlock1Ptr->easyChatBattleWon[i];
playerRecord->speechLost[i] = gSaveBlock1Ptr->unk2BD4[i]; playerRecord->speechLost[i] = gSaveBlock1Ptr->easyChatBattleLost[i];
} }
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
@ -3059,7 +3059,7 @@ static void FillEReaderTrainerWithPlayerData(void)
j = 7; j = 7;
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
{ {
ereaderTrainer->greeting[i] = gSaveBlock1Ptr->unk2BBC[i]; ereaderTrainer->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i];
ereaderTrainer->farewellPlayerLost[i] = j; ereaderTrainer->farewellPlayerLost[i] = j;
ereaderTrainer->farewellPlayerWon[i] = j + 6; ereaderTrainer->farewellPlayerWon[i] = j + 6;
j++; j++;

File diff suppressed because it is too large Load Diff

View File

@ -695,7 +695,7 @@ u8 sub_818E2D8(void)
void sub_818E2FC(void) void sub_818E2FC(void)
{ {
easy_chat_input_maybe(); ShowEasyChatScreen();
} }
bool8 sub_818E308(void) bool8 sub_818E308(void)
@ -763,8 +763,8 @@ void sub_818E430(void)
void sub_818E47C(void) void sub_818E47C(void)
{ {
gSpecialVar_0x8004 = 0x11; gSpecialVar_0x8004 = EASY_CHAT_TYPE_QUIZ_SET_QUESTION;
easy_chat_input_maybe(); ShowEasyChatScreen();
} }
void sub_818E490(void) void sub_818E490(void)

View File

@ -63,6 +63,7 @@
#include "window.h" #include "window.h"
#include "constants/battle.h" #include "constants/battle.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/easy_chat.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/items.h" #include "constants/items.h"
@ -4211,7 +4212,11 @@ static void sub_81B452C(void)
{ {
u8 mail = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_MAIL); u8 mail = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_MAIL);
sub_811A20C(4, gSaveBlock1Ptr->mail[mail].words, sub_81B4578, 3); DoEasyChatScreen(
EASY_CHAT_TYPE_MAIL,
gSaveBlock1Ptr->mail[mail].words,
sub_81B4578,
EASY_CHAT_PERSON_DISPLAY_NONE);
} }
static void sub_81B4578(void) static void sub_81B4578(void)
@ -6385,7 +6390,11 @@ static void sub_81B814C(void)
sub_81B1DB8(&gPlayerParty[gUnknown_0203CEC8.unk9], gUnknown_0203CEC8.unkC); sub_81B1DB8(&gPlayerParty[gUnknown_0203CEC8.unk9], gUnknown_0203CEC8.unkC);
mail = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_MAIL); mail = GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_MAIL);
sub_811A20C(4, gSaveBlock1Ptr->mail[mail].words, sub_81B81A8, 3); DoEasyChatScreen(
EASY_CHAT_TYPE_MAIL,
gSaveBlock1Ptr->mail[mail].words,
sub_81B81A8,
EASY_CHAT_PERSON_DISPLAY_NONE);
} }
static void sub_81B81A8(void) static void sub_81B81A8(void)

View File

@ -695,7 +695,7 @@ static void SetPlayerCardData(struct TrainerCard *trainerCard, u8 cardType)
trainerCard->money = GetMoney(&gSaveBlock1Ptr->money); trainerCard->money = GetMoney(&gSaveBlock1Ptr->money);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
trainerCard->var_28[i] = gSaveBlock1Ptr->unk2BB0[i]; trainerCard->var_28[i] = gSaveBlock1Ptr->easyChatProfile[i];
StringCopy(trainerCard->playerName, gSaveBlock2Ptr->playerName); StringCopy(trainerCard->playerName, gSaveBlock2Ptr->playerName);

View File

@ -2448,8 +2448,8 @@ void sub_80EE72C(void)
show->trainerFanClub.kind = TVSHOW_TRAINER_FAN_CLUB; show->trainerFanClub.kind = TVSHOW_TRAINER_FAN_CLUB;
show->trainerFanClub.active = FALSE; show->trainerFanClub.active = FALSE;
StringCopy(show->trainerFanClub.playerName, gSaveBlock2Ptr->playerName); StringCopy(show->trainerFanClub.playerName, gSaveBlock2Ptr->playerName);
show->trainerFanClub.words[0] = gSaveBlock1Ptr->unk2BB0[0]; show->trainerFanClub.words[0] = gSaveBlock1Ptr->easyChatProfile[0];
show->trainerFanClub.words[1] = gSaveBlock1Ptr->unk2BB0[1]; show->trainerFanClub.words[1] = gSaveBlock1Ptr->easyChatProfile[1];
tv_store_id_3x(show); tv_store_id_3x(show);
show->trainerFanClub.language = gGameLanguage; show->trainerFanClub.language = gGameLanguage;
} }