atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

initial documentation commit

Browse source
This commit is contained in:
GriffinR 2019-08-04 04:22:19 -04:00 committed by huderlem
parent d68497f823
commit 23979c4d7d
11 changed files with 782 additions and 460 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
data/event_scripts.s
View file

@ -4281,7 +4281,7 @@ GraniteCave_B1F_Movement_2A8369: @ 82A8369
step_end
LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B
special sub_818DAEC
special Script_GetLilycoveLadyId
switch VAR_RESULT
case 0, LilycoveCity_PokemonCenter_1F_EventScript_2A8554
case 1, LilycoveCity_PokemonCenter_1F_EventScript_2A8395
@ -4307,7 +4307,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A83C6:: @ 82A83C6
end
LilycoveCity_PokemonCenter_1F_EventScript_2A83D0:: @ 82A83D0
special sub_818DC2C
special BufferFavorLadyDescription
msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, MSGBOX_DEFAULT
specialvar VAR_RESULT, sub_818DC60
compare VAR_RESULT, 0
@ -4357,7 +4357,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A845E:: @ 82A845E
LilycoveCity_PokemonCenter_1F_EventScript_2A846C:: @ 82A846C
fadescreen 1
setvar VAR_RESULT, 0
special sub_818DD78
special OpenBagMenuForFavorLady
waitstate
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A848E
@ -4382,7 +4382,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A84AD:: @ 82A84AD
end
LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9
special sub_818DC2C
special BufferFavorLadyDescription
msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C0F, MSGBOX_DEFAULT
release
end
@ -4396,13 +4396,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A84D6:: @ 82A84D6
end
LilycoveCity_PokemonCenter_1F_EventScript_2A84F2:: @ 82A84F2
special sub_818DC2C
special BufferFavorLadyDescription
msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C6F, MSGBOX_DEFAULT
release
end
LilycoveCity_PokemonCenter_1F_EventScript_2A84FF:: @ 82A84FF
special sub_818DC2C
special BufferFavorLadyDescription
msgbox LilycoveCity_PokemonCenter_1F_Text_2A8CC8, MSGBOX_DEFAULT
goto LilycoveCity_PokemonCenter_1F_EventScript_2A8510
end
@ -4432,7 +4432,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8554:: @ 82A8554
lock
faceplayer
msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, MSGBOX_DEFAULT
specialvar VAR_RESULT, sub_818E038
specialvar VAR_RESULT, GetQuizLadyPhase
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585
compare VAR_RESULT, 1
@ -4452,7 +4452,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8585:: @ 82A8585
end
LilycoveCity_PokemonCenter_1F_EventScript_2A85AC:: @ 82A85AC
specialvar VAR_RESULT, sub_818E2D8
specialvar VAR_RESULT, IsQuizLadyWaitingForChallenger
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8759
compare VAR_RESULT, 1
@ -4489,7 +4489,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612
end
LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C
special sub_818E3BC
special ClearQuizLadyResponse
compare VAR_0x8004, 0
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C
compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER
@ -4528,7 +4528,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A867F:: @ 82A867F
end
LilycoveCity_PokemonCenter_1F_EventScript_2A8689:: @ 82A8689
special sub_818E37C
special SetQuizLadyPhase_MakeYourOwn
msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, MSGBOX_DEFAULT
specialvar VAR_RESULT, sub_818E308
compare VAR_RESULT, 0
@ -4576,8 +4576,8 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8716:: @ 82A8716
LilycoveCity_PokemonCenter_1F_EventScript_2A8724:: @ 82A8724
setvar VAR_0x8005, 0
special sub_818E358
special sub_818E37C
special BufferQuizPrizeItem
special SetQuizLadyPhase_MakeYourOwn
giveitem_std VAR_0x8005
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A874C
@ -4586,7 +4586,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8724:: @ 82A8724
LilycoveCity_PokemonCenter_1F_EventScript_2A874C:: @ 82A874C
msgbox LilycoveCity_PokemonCenter_1F_Text_2A906A, MSGBOX_DEFAULT
special sub_818E39C
special SetQuizLadyPhase_GivePrize
release
end
@ -4629,7 +4629,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF
LilycoveCity_PokemonCenter_1F_EventScript_2A87CE:: @ 82A87CE
msgbox LilycoveCity_PokemonCenter_1F_Text_2A9270, MSGBOX_DEFAULT
special sub_818E430
special sub_818E3BC
special ClearQuizLadyResponse
setvar VAR_0x8004, 16
LilycoveCity_PokemonCenter_1F_EventScript_2A87E1:: @ 82A87E1

2
data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
View file

@ -9,7 +9,7 @@ LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD
end
LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6
special sub_818D9C0
special SetLilycoveLadyGfx
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0
compare VAR_RESULT, 1

20
data/specials.inc
View file

@ -372,30 +372,30 @@ gSpecials:: @ 81DBA64
def_special SetSecretBaseSecretsTvFlags_LargeDecorationSpot
def_special SetSecretBaseSecretsTvFlags_SmallDecorationSpot
def_special SetSecretBaseSecretsTvFlags_Poster
def_special sub_818D9C0
def_special sub_818DAEC
def_special SetLilycoveLadyGfx
def_special Script_GetLilycoveLadyId
def_special sub_818DBE8
def_special sub_818DC2C
def_special BufferFavorLadyDescription
def_special sub_818DC60
def_special sub_818DCC8
def_special sub_818DD14
def_special sub_818DD54
def_special sub_818DD78
def_special OpenBagMenuForFavorLady
def_special sub_818DE44
def_special sub_818DE5C
def_special sub_818DEA0
def_special sub_818DEDC
def_special sub_818E038
def_special GetQuizLadyPhase
def_special sub_818E06C
def_special sub_818E2D8
def_special IsQuizLadyWaitingForChallenger
def_special sub_811A858
def_special sub_818E2FC
def_special sub_818E308
def_special sub_818E358
def_special sub_818E37C
def_special BufferQuizPrizeItem
def_special SetQuizLadyPhase_MakeYourOwn
def_special sub_818E298
def_special sub_818E39C
def_special sub_818E3BC
def_special SetQuizLadyPhase_GivePrize
def_special ClearQuizLadyResponse
def_special sub_818E3E0
def_special sub_818E430
def_special sub_818E47C

16
include/global.h
View file

@ -748,26 +748,26 @@ struct LilycoveLadyQuiz
{
/*0x000*/ u8 id;
/*0x001*/ u8 phase;
/*0x002*/ u16 unk_002[9];
/*0x014*/ u16 unk_014;
/*0x016*/ u16 unk_016;
/*0x002*/ u16 question[9];
/*0x014*/ u16 answer;
/*0x016*/ u16 response;
/*0x018*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
/*0x020*/ u16 playerTrainerId[4];
/*0x028*/ u16 itemId;
/*0x02a*/ u8 unk_02a;
/*0x02b*/ u8 unk_02b;
/*0x02c*/ u8 unk_02c;
/*0x02a*/ bool8 waitingForChallenger;
/*0x02b*/ u8 questionId;
/*0x02c*/ u8 prevQuestionId;
/*0x02d*/ u8 language;
};
struct LilycoveLadyFavour
struct LilycoveLadyFavor
{
/*0x000*/ u8 id;
/*0x001*/ u8 phase;
/*0x002*/ u8 unk_002;
/*0x003*/ u8 unk_003;
/*0x004*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
/*0x00c*/ u8 unk_00c;
/*0x00c*/ u8 favorId;
/*0x00e*/ u16 itemId;
/*0x010*/ u16 unk_010;
/*0x012*/ u8 language;

2
include/lilycove_lady.h
View file

@ -11,7 +11,7 @@ bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock);
void sub_818E7E0(u8 *dest1, u8 *dest2);
void sub_818E81C(u8 *dest);
void sub_818E848(u8 *dest);
void sub_818E868(u8 *dest, u8 category);
void BufferContestName(u8 *dest, u8 category);
u8 sub_818E880(void);
#endif //GUARD_LILYCOVE_LADY_H

25
include/strings.h
View file

@ -2744,6 +2744,31 @@ extern const u8 gText_JumpsInARow[];
extern const u8 gText_BestScore2[];
extern const u8 gText_ExcellentsInARow[];
// Lilycove Lady
extern const u8 gText_Handsome[];
extern const u8 gText_Vinny[];
extern const u8 gText_Moreme[];
extern const u8 gText_Ironhard[];
extern const u8 gText_Muscle[];
extern const u8 gText_Coolness[];
extern const u8 gText_Beauty[];
extern const u8 gText_Cuteness[];
extern const u8 gText_Smartness[];
extern const u8 gText_Toughness[];
extern const u8 gText_Lady2[];
extern const u8 gText_Slippery[];
extern const u8 gText_Roundish[];
extern const u8 gText_Whamish[];
extern const u8 gText_Shiny[];
extern const u8 gText_Sticky[];
extern const u8 gText_Pointy[];
extern const u8 gText_CoolnessContest[];
extern const u8 gText_BeautyContest[];
extern const u8 gText_CutenessContest[];
extern const u8 gText_SmartnessContest[];
extern const u8 gText_ToughnessContest[];
// Pokenav Match Call
extern const u8 gText_CallCantBeMadeHere[];
extern const u8 gText_NumberRegistered[];

2
src/contest_painting.c
View file

@ -292,7 +292,7 @@ static void PrintContestPaintingCaption(u8 contestType, u8 arg1)
category = gUnknown_030061C0->contestCategory;
if (contestType < 8)
{
sub_818E868(gStringVar1, category);
BufferContestName(gStringVar1, category);
StringAppend(gStringVar1, gText_Space);
StringAppend(gStringVar1, gContestRankTextPointers[gUnknown_030061C0->contestRank]);
StringCopy(gStringVar2, gUnknown_030061C0->trainerName);

1099
src/lilycove_lady.c
View file

File diff suppressed because it is too large Load diff

2
src/scrcmd.c
View file

@ -1633,7 +1633,7 @@ bool8 ScrCmd_buffercontesttype(struct ScriptContext *ctx)
u8 stringVarIndex = ScriptReadByte(ctx);
u16 index = VarGet(ScriptReadHalfword(ctx));
sub_818E868(sScriptStringVars[stringVarIndex], index);
BufferContestName(sScriptStringVars[stringVarIndex], index);
return FALSE;
}

42
src/strings.c
View file

@ -610,11 +610,11 @@ const u8 gUnknown_085EAD72[] = _("What's a CONTEST?");
const u8 gUnknown_085EAD84[] = _("Types of CONTESTS");
const u8 gUnknown_085EAD96[] = _("Ranks");
const u8 gUnknown_085EAD9C[] = _("Judging");
const u8 gUnknown_085EADA4[] = _("COOLNESS CONTEST");
const u8 gUnknown_085EADB5[] = _("BEAUTY CONTEST");
const u8 gUnknown_085EADC4[] = _("CUTENESS CONTEST");
const u8 gUnknown_085EADD5[] = _("SMARTNESS CONTEST");
const u8 gUnknown_085EADE7[] = _("TOUGHNESS CONTEST");
const u8 gText_CoolnessContest[] = _("COOLNESS CONTEST");
const u8 gText_BeautyContest[] = _("BEAUTY CONTEST");
const u8 gText_CutenessContest[] = _("CUTENESS CONTEST");
const u8 gText_SmartnessContest[] = _("SMARTNESS CONTEST");
const u8 gText_ToughnessContest[] = _("TOUGHNESS CONTEST");
const u8 gUnknown_085EADF9[] = _("DECORATION");
const u8 gUnknown_085EAE04[] = _("PACK UP");
const u8 gUnknown_085EAE0C[] = _("COUNT");
@ -1591,23 +1591,23 @@ const u8 gText_PkmnsNickname[] = _("{STR_VAR_1}'s nickname?");
const u8 gText_TellHimTheWords[] = _("Tell him the words.");
const u8 gText_MoveOkBack[] = _("{DPAD_NONE}MOVE {A_BUTTON}OK {B_BUTTON}BACK");
const u8 gText_CallCantBeMadeHere[] = _("A call can't be made from here.");
const u8 gUnknown_085EEB2B[] = _("HANDSOME");
const u8 gUnknown_085EEB34[] = _("VINNY");
const u8 gUnknown_085EEB3A[] = _("MOREME");
const u8 gUnknown_085EEB41[] = _("IRONHARD");
const u8 gUnknown_085EEB4A[] = _("MUSCLE");
const u8 gUnknown_085EEB51[] = _("coolness");
const u8 gUnknown_085EEB5A[] = _("beauty");
const u8 gUnknown_085EEB61[] = _("cuteness");
const u8 gUnknown_085EEB6A[] = _("smartness");
const u8 gUnknown_085EEB74[] = _("toughness");
const u8 gText_Handsome[] = _("HANDSOME");
const u8 gText_Vinny[] = _("VINNY");
const u8 gText_Moreme[] = _("MOREME");
const u8 gText_Ironhard[] = _("IRONHARD");
const u8 gText_Muscle[] = _("MUSCLE");
const u8 gText_Coolness[] = _("coolness");
const u8 gText_Beauty[] = _("beauty");
const u8 gText_Cuteness[] = _("cuteness");
const u8 gText_Smartness[] = _("smartness");
const u8 gText_Toughness[] = _("toughness");
const u8 gText_Lady2[] = _("Lady");
const u8 gUnknown_085EEB83[] = _("slippery");
const u8 gUnknown_085EEB8C[] = _("roundish");
const u8 gUnknown_085EEB95[] = _("wham-ish");
const u8 gUnknown_085EEB9E[] = _("shiny");
const u8 gUnknown_085EEBA4[] = _("sticky");
const u8 gUnknown_085EEBAB[] = _("pointy");
const u8 gText_Slippery[] = _("slippery");
const u8 gText_Roundish[] = _("roundish");
const u8 gText_Whamish[] = _("wham-ish");
const u8 gText_Shiny[] = _("shiny");
const u8 gText_Sticky[] = _("sticky");
const u8 gText_Pointy[] = _("pointy");
const u8 gText_RentalPkmn2[] = _("RENTAL POKéMON");
const u8 gText_SelectFirstPkmn[] = _("Select the first POKéMON.");
const u8 gText_SelectSecondPkmn[] = _("Select the second POKéMON.");

4
src/tv.c
View file

@ -5600,7 +5600,7 @@ static void DoTVShowPokemonContestLiveUpdates(void)
switch (state)
{
case 0:
sub_818E868(gStringVar1, show->contestLiveUpdates.category);
BufferContestName(gStringVar1, show->contestLiveUpdates.category);
StringCopy(gStringVar2, gSpeciesNames[show->contestLiveUpdates.species]);
TVShowConvertInternationalString(gStringVar3, show->contestLiveUpdates.playerName, show->contestLiveUpdates.language);
if (show->contestLiveUpdates.round1Rank == show->contestLiveUpdates.round2Rank)
@ -7720,7 +7720,7 @@ static void DoTVShowPokemonContestLiveUpdates2(void)
switch (state)
{
case 0:
sub_818E868(gStringVar1, show->contestLiveUpdates2.contestCategory);
BufferContestName(gStringVar1, show->contestLiveUpdates2.contestCategory);
if (show->contestLiveUpdates2.pokeblockState == 1)
{
sTVShowState = 1;