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

Merge remote-tracking branch 'upstream/master' into move-tutor

Browse Source 
# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c
This commit is contained in:
Marcus Huderle
2019-03-17 17:20:40 -05:00
parent c3feb9871f 4ae8a52473
commit e9a3cc6d51
3041 changed files with 6917 additions and 6419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/party_menu.c
+11 -11
View File
@@ -1176,10 +1176,10 @@ static const struct OamData gOamData_83765EC =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
.matrixNum = 0,
.size = 0,
.size = SPRITE_SIZE(8x8),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
@@ -1232,10 +1232,10 @@ static const struct OamData sOamData_8615ED8 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
.matrixNum = 0,
.size = 2,
.size = SPRITE_SIZE(32x32),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
@@ -1288,10 +1288,10 @@ static const struct OamData sOamData_8615F20 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
.matrixNum = 0,
.size = 1,
.size = SPRITE_SIZE(16x16),
.tileNum = 0,
.priority = 2,
.paletteNum = 0,
@@ -1367,10 +1367,10 @@ static const struct OamData sOamData_8615F90 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 1,
.shape = SPRITE_SHAPE(32x8),
.x = 0,
.matrixNum = 0,
.size = 1,
.size = SPRITE_SIZE(32x8),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
@@ -2937,7 +2937,7 @@ u8 pokemon_ailments_get_primary(u32 status)
return AILMENT_NONE;
}
u8 sub_81B205C(struct Pokemon *mon)
u8 GetMonAilment(struct Pokemon *mon)
{
u8 ailment;
@@ -3356,7 +3356,7 @@ static void DisplayPartyPokemonLevelCheck(struct Pokemon *mon, struct Struct203C
{
if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
{
u8 ailment = sub_81B205C(mon);
u8 ailment = GetMonAilment(mon);
if (ailment == AILMENT_NONE || ailment == AILMENT_PKRS)
{
if (c != 0)
@@ -5185,7 +5185,7 @@ static void party_menu_link_mon_status_condition_object(u16 species, u8 status,
static void party_menu_get_status_condition_and_update_object(struct Pokemon *mon, struct Struct203CEDC *ptr)
{
party_menu_update_status_condition_object(sub_81B205C(mon), ptr);
party_menu_update_status_condition_object(GetMonAilment(mon), ptr);
}
static void party_menu_update_status_condition_object(u8 status, struct Struct203CEDC *ptr)