dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Continue macro comment updating

Browse Source
This commit is contained in:
GriffinR
2021-11-17 17:15:45 -05:00
parent 700425ef5f
commit c940b67716
10 changed files with 124 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/data/lilycove_lady.h
View File

@@ -5,11 +5,11 @@
static const u16 sContestLadyMonGfxId[] =
{
OBJ_EVENT_GFX_ZIGZAGOON_1,
OBJ_EVENT_GFX_SKITTY,
OBJ_EVENT_GFX_POOCHYENA,
OBJ_EVENT_GFX_KECLEON,
OBJ_EVENT_GFX_PIKACHU
[CONTEST_CATEGORY_COOL] = OBJ_EVENT_GFX_ZIGZAGOON_1,
[CONTEST_CATEGORY_BEAUTY] = OBJ_EVENT_GFX_SKITTY,
[CONTEST_CATEGORY_CUTE] = OBJ_EVENT_GFX_POOCHYENA,
[CONTEST_CATEGORY_SMART] = OBJ_EVENT_GFX_KECLEON,
[CONTEST_CATEGORY_TOUGH] = OBJ_EVENT_GFX_PIKACHU
};
static const u16 sLilycoveLadyGfxId[] =
@@ -434,36 +434,36 @@ static const u16 sFavorLadyPrizes[] =
static const u8 *const sContestLadyMonNames[] =
{
gText_ContestLady_Handsome,
gText_ContestLady_Vinny,
gText_ContestLady_Moreme,
gText_ContestLady_Ironhard,
gText_ContestLady_Muscle
[CONTEST_CATEGORY_COOL] = gText_ContestLady_Handsome,
[CONTEST_CATEGORY_BEAUTY] = gText_ContestLady_Vinny,
[CONTEST_CATEGORY_CUTE] = gText_ContestLady_Moreme,
[CONTEST_CATEGORY_SMART] = gText_ContestLady_Ironhard,
[CONTEST_CATEGORY_TOUGH] = gText_ContestLady_Muscle
};
static const u8 *const sContestLadyCategoryNames[] =
{
gText_ContestLady_Coolness,
gText_ContestLady_Beauty,
gText_ContestLady_Cuteness,
gText_ContestLady_Smartness,
gText_ContestLady_Toughness
[CONTEST_CATEGORY_COOL] = gText_ContestLady_Coolness,
[CONTEST_CATEGORY_BEAUTY] = gText_ContestLady_Beauty,
[CONTEST_CATEGORY_CUTE] = gText_ContestLady_Cuteness,
[CONTEST_CATEGORY_SMART] = gText_ContestLady_Smartness,
[CONTEST_CATEGORY_TOUGH] = gText_ContestLady_Toughness
};
static const u8 *const sContestNames[] =
{
gText_CoolnessContest,
gText_BeautyContest,
gText_CutenessContest,
gText_SmartnessContest,
gText_ToughnessContest
[CONTEST_CATEGORY_COOL] = gText_CoolnessContest,
[CONTEST_CATEGORY_BEAUTY] = gText_BeautyContest,
[CONTEST_CATEGORY_CUTE] = gText_CutenessContest,
[CONTEST_CATEGORY_SMART] = gText_SmartnessContest,
[CONTEST_CATEGORY_TOUGH] = gText_ToughnessContest
};
static const u16 sContestLadyMonSpecies[] =
{
SPECIES_ZIGZAGOON,
SPECIES_SKITTY,
SPECIES_POOCHYENA,
SPECIES_KECLEON,
SPECIES_PIKACHU
[CONTEST_CATEGORY_COOL] = SPECIES_ZIGZAGOON,
[CONTEST_CATEGORY_BEAUTY] = SPECIES_SKITTY,
[CONTEST_CATEGORY_CUTE] = SPECIES_POOCHYENA,
[CONTEST_CATEGORY_SMART] = SPECIES_KECLEON,
[CONTEST_CATEGORY_TOUGH] = SPECIES_PIKACHU
};

4
src/event_object_movement.c
View File

@@ -1915,7 +1915,7 @@ void AllowObjectAtPosTriggerGroundEffects(s16 x, s16 y)
}
}
void SetObjectPriority(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority)
void SetObjectSubpriority(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority)
{
u8 objectEventId;
struct ObjectEvent *objectEvent;
@@ -1930,7 +1930,7 @@ void SetObjectPriority(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority)
}
}
void ResetObjectPriority(u8 localId, u8 mapNum, u8 mapGroup)
void ResetObjectSubpriority(u8 localId, u8 mapNum, u8 mapGroup)
{
u8 objectEventId;
struct ObjectEvent *objectEvent;

14
src/scrcmd.c
View File

@@ -1128,24 +1128,24 @@ bool8 ScrCmd_hideobject_at(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_setobjectpriority(struct ScriptContext *ctx)
bool8 ScrCmd_setobjectsubpriority(struct ScriptContext *ctx)
{
u16 localId = VarGet(ScriptReadHalfword(ctx));
u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx);
u8 priority = ScriptReadByte(ctx);
SetObjectPriority(localId, mapNum, mapGroup, priority + 83);
SetObjectSubpriority(localId, mapNum, mapGroup, priority + 83);
return FALSE;
}
bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx)
bool8 ScrCmd_resetobjectsubpriority(struct ScriptContext *ctx)
{
u16 localId = VarGet(ScriptReadHalfword(ctx));
u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx);
ResetObjectPriority(localId, mapNum, mapGroup);
ResetObjectSubpriority(localId, mapNum, mapGroup);
return FALSE;
}
@@ -1635,12 +1635,12 @@ bool8 ScrCmd_bufferstdstring(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_buffercontesttype(struct ScriptContext *ctx)
bool8 ScrCmd_buffercontestname(struct ScriptContext *ctx)
{
u8 stringVarIndex = ScriptReadByte(ctx);
u16 index = VarGet(ScriptReadHalfword(ctx));
u16 category = VarGet(ScriptReadHalfword(ctx));
BufferContestName(sScriptStringVars[stringVarIndex], index);
BufferContestName(sScriptStringVars[stringVarIndex], category);
return FALSE;
}