Sync trade anim
This commit is contained in:
+4
-4
@@ -1237,11 +1237,11 @@ const u16 gMonMarkingsMenu_Pal[] = INCBIN_U16("graphics/misc/markings2.gbapal");
|
||||
const u16 gMonMarkingsMenu_Gfx[] = INCBIN_U16("graphics/misc/markings2.4bpp");
|
||||
|
||||
const u16 gTradeMenu_Pal[] = INCBIN_U16("graphics/trade/menu.gbapal");
|
||||
const u16 gTradeCursor_Pal[] = INCBIN_U16("graphics/trade/unknown_DDB444.gbapal");
|
||||
const u16 gTradeCursor_Pal[] = INCBIN_U16("graphics/trade/cursor.gbapal");
|
||||
const u16 gTradeMenu_Gfx[] = INCBIN_U16("graphics/trade/menu.4bpp");
|
||||
const u16 gTradeCursor_Gfx[] = INCBIN_U16("graphics/trade/buttons.4bpp");
|
||||
const u16 gUnknown_8E9E9DC[] = INCBIN_U16("graphics/unused/unused_DDCEE4.bin");
|
||||
const u16 gTradeMenu_Tilemap[] = INCBIN_U16("graphics/trade/unknown_DDCF04.bin");
|
||||
const u16 gTradeCursor_Gfx[] = INCBIN_U16("graphics/trade/cursor.4bpp");
|
||||
const u16 gTradeUnused_Tilemap[] = INCBIN_U16("graphics/trade/unused.bin");
|
||||
const u16 gTradeMenu_Tilemap[] = INCBIN_U16("graphics/trade/menu.bin");
|
||||
const u16 gTradeMenuMonBox_Tilemap[] = INCBIN_U16("graphics/trade/menu_mon_box.bin");
|
||||
|
||||
const u16 gFameCheckerBgPals[] = INCBIN_U16("graphics/fame_checker/bg.gbapal");
|
||||
|
||||
+1
-1
@@ -5780,7 +5780,7 @@ bool32 IsHMMove2(u16 move)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
bool8 IsPokeSpriteNotFlipped(u16 species)
|
||||
bool8 IsMonSpriteNotFlipped(u16 species)
|
||||
{
|
||||
return gBaseStats[species].noFlip;
|
||||
}
|
||||
|
||||
@@ -4035,7 +4035,7 @@ static void PokeSum_CreateMonPicSprite(void)
|
||||
|
||||
FreeSpriteOamMatrix(&gSprites[spriteId]);
|
||||
|
||||
if (!IsPokeSpriteNotFlipped(species))
|
||||
if (!IsMonSpriteNotFlipped(species))
|
||||
gSprites[spriteId].hFlip = TRUE;
|
||||
else
|
||||
gSprites[spriteId].hFlip = FALSE;
|
||||
@@ -4162,7 +4162,7 @@ static void PokeSum_CreateMonIconSprite(void)
|
||||
sMonSummaryScreen->monIconSpriteId = CreateMonIcon(species, SpriteCallbackDummy, 24, 32, 0, personality, 1);
|
||||
}
|
||||
|
||||
if (!IsPokeSpriteNotFlipped(species))
|
||||
if (!IsMonSpriteNotFlipped(species))
|
||||
gSprites[sMonSummaryScreen->monIconSpriteId].hFlip = TRUE;
|
||||
else
|
||||
gSprites[sMonSummaryScreen->monIconSpriteId].hFlip = FALSE;
|
||||
|
||||
+1
-1
@@ -1423,7 +1423,7 @@ static void SetActiveMenuOptions(void)
|
||||
}
|
||||
else
|
||||
{
|
||||
// Absent partner pokemno
|
||||
// Absent partner pokemon
|
||||
sTradeMenu->optionsActive[i + PARTY_SIZE] = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
+1108
-1087
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user