Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-08 11:06:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone
2023-11-02 21:24:35 -04:00
committed by leo60228
parent 392a65dec0 1467ffa3d8
commit eccd2c4a65
248 changed files with 6386 additions and 2820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
include/graphics.h
View File

@@ -1368,14 +1368,6 @@ extern const u32 gMonFrontPic_MagearnaOriginalColor[];
extern const u32 gMonFrontPic_CramorantGulping[];
extern const u32 gMonFrontPic_CramorantGorging[];
extern const u32 gMonFrontPic_ToxtricityLowKey[];
extern const u32 gMonFrontPic_AlcremieRubyCream[];
extern const u32 gMonFrontPic_AlcremieMatchaCream[];
extern const u32 gMonFrontPic_AlcremieMintCream[];
extern const u32 gMonFrontPic_AlcremieLemonCream[];
extern const u32 gMonFrontPic_AlcremieSaltedCream[];
extern const u32 gMonFrontPic_AlcremieRubySwirl[];
extern const u32 gMonFrontPic_AlcremieCaramelSwirl[];
extern const u32 gMonFrontPic_AlcremieRainbowSwirl[];
extern const u32 gMonFrontPic_EiscueNoiceFace[];
extern const u32 gMonFrontPic_IndeedeeFemale[];
extern const u32 gMonFrontPic_MorpekoHangry[];
@@ -2653,14 +2645,6 @@ extern const u32 gMonBackPic_MagearnaOriginalColor[];
extern const u32 gMonBackPic_CramorantGulping[];
extern const u32 gMonBackPic_CramorantGorging[];
extern const u32 gMonBackPic_ToxtricityLowKey[];
extern const u32 gMonBackPic_AlcremieRubyCream[];
extern const u32 gMonBackPic_AlcremieMatchaCream[];
extern const u32 gMonBackPic_AlcremieMintCream[];
extern const u32 gMonBackPic_AlcremieLemonCream[];
extern const u32 gMonBackPic_AlcremieSaltedCream[];
extern const u32 gMonBackPic_AlcremieRubySwirl[];
extern const u32 gMonBackPic_AlcremieCaramelSwirl[];
extern const u32 gMonBackPic_AlcremieRainbowSwirl[];
extern const u32 gMonBackPic_EiscueNoiceFace[];
extern const u32 gMonBackPic_IndeedeeFemale[];
extern const u32 gMonBackPic_MorpekoHangry[];
@@ -3918,14 +3902,6 @@ extern const u32 gMonPalette_MagearnaOriginalColor[];
extern const u32 gMonPalette_CramorantGulping[];
extern const u32 gMonPalette_CramorantGorging[];
extern const u32 gMonPalette_ToxtricityLowKey[];
extern const u32 gMonPalette_AlcremieRubyCream[];
extern const u32 gMonPalette_AlcremieMatchaCream[];
extern const u32 gMonPalette_AlcremieMintCream[];
extern const u32 gMonPalette_AlcremieLemonCream[];
extern const u32 gMonPalette_AlcremieSaltedCream[];
extern const u32 gMonPalette_AlcremieRubySwirl[];
extern const u32 gMonPalette_AlcremieCaramelSwirl[];
extern const u32 gMonPalette_AlcremieRainbowSwirl[];
extern const u32 gMonPalette_EiscueNoiceFace[];
extern const u32 gMonPalette_IndeedeeFemale[];
extern const u32 gMonPalette_MorpekoHangry[];
@@ -5178,14 +5154,6 @@ extern const u32 gMonShinyPalette_MagearnaOriginalColor[];
extern const u32 gMonShinyPalette_CramorantGulping[];
extern const u32 gMonShinyPalette_CramorantGorging[];
extern const u32 gMonShinyPalette_ToxtricityLowKey[];
extern const u32 gMonShinyPalette_AlcremieRubyCream[];
extern const u32 gMonShinyPalette_AlcremieMatchaCream[];
extern const u32 gMonShinyPalette_AlcremieMintCream[];
extern const u32 gMonShinyPalette_AlcremieLemonCream[];
extern const u32 gMonShinyPalette_AlcremieSaltedCream[];
extern const u32 gMonShinyPalette_AlcremieRubySwirl[];
extern const u32 gMonShinyPalette_AlcremieCaramelSwirl[];
extern const u32 gMonShinyPalette_AlcremieRainbowSwirl[];
extern const u32 gMonShinyPalette_EiscueNoiceFace[];
extern const u32 gMonShinyPalette_IndeedeeFemale[];
extern const u32 gMonShinyPalette_MorpekoHangry[];
@@ -6119,7 +6087,15 @@ extern const u8 gMonIcon_Sirfetchd[];
extern const u8 gMonIcon_MrRime[];
extern const u8 gMonIcon_Runerigus[];
extern const u8 gMonIcon_Milcery[];
extern const u8 gMonIcon_Alcremie[];
extern const u8 gMonIcon_AlcremieStrawberryVanillaCream[];
//extern const u8 gMonIcon_AlcremieStrawberryRubyCream[];
//extern const u8 gMonIcon_AlcremieStrawberryMatchaCream[];
//extern const u8 gMonIcon_AlcremieStrawberryMintCream[];
//extern const u8 gMonIcon_AlcremieStrawberryLemonCream[];
//extern const u8 gMonIcon_AlcremieStrawberrySaltedCream[];
//extern const u8 gMonIcon_AlcremieStrawberryRubySwirl[];
//extern const u8 gMonIcon_AlcremieStrawberryCaramelSwirl[];
//extern const u8 gMonIcon_AlcremieStrawberryRainbowSwirl[];
extern const u8 gMonIcon_Falinks[];
extern const u8 gMonIcon_Pincurchin[];
extern const u8 gMonIcon_Snom[];
@@ -6433,14 +6409,6 @@ extern const u8 gMonIcon_MagearnaOriginalColor[];
extern const u8 gMonIcon_CramorantGulping[];
extern const u8 gMonIcon_CramorantGorging[];
extern const u8 gMonIcon_ToxtricityLowKey[];
//extern const u8 gMonIcon_AlcremieStrawberryRubyCream[];
//extern const u8 gMonIcon_AlcremieStrawberryMatchaCream[];
//extern const u8 gMonIcon_AlcremieStrawberryMintCream[];
//extern const u8 gMonIcon_AlcremieStrawberryLemonCream[];
//extern const u8 gMonIcon_AlcremieStrawberrySaltedCream[];
//extern const u8 gMonIcon_AlcremieStrawberryRubySwirl[];
//extern const u8 gMonIcon_AlcremieStrawberryCaramelSwirl[];
//extern const u8 gMonIcon_AlcremieStrawberryRainbowSwirl[];
extern const u8 gMonIcon_EiscueNoiceFace[];
extern const u8 gMonIcon_IndeedeeFemale[];
extern const u8 gMonIcon_MorpekoHangry[];
@@ -7366,12 +7334,97 @@ extern const u8 gMonFootprint_Sirfetchd[];
extern const u8 gMonFootprint_Mr_Rime[];
extern const u8 gMonFootprint_Runerigus[];
extern const u8 gMonFootprint_Milcery[];
extern const u32 gMonFrontPic_AlcremieStrawberry[];
extern const u32 gMonPalette_AlcremieStrawberryVanillaCream[];
extern const u32 gMonPalette_AlcremieStrawberryRubyCream[];
extern const u32 gMonPalette_AlcremieStrawberryMatchaCream[];
extern const u32 gMonPalette_AlcremieStrawberryMintCream[];
extern const u32 gMonPalette_AlcremieStrawberryLemonCream[];
extern const u32 gMonPalette_AlcremieStrawberrySaltedCream[];
extern const u32 gMonPalette_AlcremieStrawberryRubySwirl[];
extern const u32 gMonPalette_AlcremieStrawberryCaramelSwirl[];
extern const u32 gMonPalette_AlcremieStrawberryRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieStrawberry[];
extern const u32 gMonShinyPalette_AlcremieStrawberry[];
extern const u8 gMonFootprint_Alcremie[];
extern const u32 gMonFrontPic_Falinks[];
extern const u32 gMonPalette_Falinks[];
extern const u32 gMonBackPic_Falinks[];
extern const u32 gMonShinyPalette_Falinks[];
extern const u8 gMonIcon_Falinks[];
extern const u32 gMonFrontPic_AlcremieBerry[];
extern const u32 gMonPalette_AlcremieBerryVanillaCream[];
extern const u32 gMonPalette_AlcremieBerryRubyCream[];
extern const u32 gMonPalette_AlcremieBerryMatchaCream[];
extern const u32 gMonPalette_AlcremieBerryMintCream[];
extern const u32 gMonPalette_AlcremieBerryLemonCream[];
extern const u32 gMonPalette_AlcremieBerrySaltedCream[];
extern const u32 gMonPalette_AlcremieBerryRubySwirl[];
extern const u32 gMonPalette_AlcremieBerryCaramelSwirl[];
extern const u32 gMonPalette_AlcremieBerryRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieBerry[];
extern const u32 gMonShinyPalette_AlcremieBerry[];
//extern const u8 gMonIcon_AlcremieBerry[];
extern const u32 gMonFrontPic_AlcremieLove[];
extern const u32 gMonPalette_AlcremieLoveVanillaCream[];
extern const u32 gMonPalette_AlcremieLoveRubyCream[];
extern const u32 gMonPalette_AlcremieLoveMatchaCream[];
extern const u32 gMonPalette_AlcremieLoveMintCream[];
extern const u32 gMonPalette_AlcremieLoveLemonCream[];
extern const u32 gMonPalette_AlcremieLoveSaltedCream[];
extern const u32 gMonPalette_AlcremieLoveRubySwirl[];
extern const u32 gMonPalette_AlcremieLoveCaramelSwirl[];
extern const u32 gMonPalette_AlcremieLoveRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieLove[];
extern const u32 gMonShinyPalette_AlcremieLove[];
//extern const u8 gMonIcon_AlcremieLove[];
extern const u32 gMonFrontPic_AlcremieStar[];
extern const u32 gMonPalette_AlcremieStarVanillaCream[];
extern const u32 gMonPalette_AlcremieStarRubyCream[];
extern const u32 gMonPalette_AlcremieStarMatchaCream[];
extern const u32 gMonPalette_AlcremieStarMintCream[];
extern const u32 gMonPalette_AlcremieStarLemonCream[];
extern const u32 gMonPalette_AlcremieStarSaltedCream[];
extern const u32 gMonPalette_AlcremieStarRubySwirl[];
extern const u32 gMonPalette_AlcremieStarCaramelSwirl[];
extern const u32 gMonPalette_AlcremieStarRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieStar[];
extern const u32 gMonShinyPalette_AlcremieStar[];
//extern const u8 gMonIcon_AlcremieStar[];
extern const u32 gMonFrontPic_AlcremieClover[];
extern const u32 gMonPalette_AlcremieCloverVanillaCream[];
extern const u32 gMonPalette_AlcremieCloverRubyCream[];
extern const u32 gMonPalette_AlcremieCloverMatchaCream[];
extern const u32 gMonPalette_AlcremieCloverMintCream[];
extern const u32 gMonPalette_AlcremieCloverLemonCream[];
extern const u32 gMonPalette_AlcremieCloverSaltedCream[];
extern const u32 gMonPalette_AlcremieCloverRubySwirl[];
extern const u32 gMonPalette_AlcremieCloverCaramelSwirl[];
extern const u32 gMonPalette_AlcremieCloverRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieClover[];
extern const u32 gMonShinyPalette_AlcremieClover[];
//extern const u8 gMonIcon_AlcremieClover[];
extern const u32 gMonFrontPic_AlcremieFlower[];
extern const u32 gMonPalette_AlcremieFlowerVanillaCream[];
extern const u32 gMonPalette_AlcremieFlowerRubyCream[];
extern const u32 gMonPalette_AlcremieFlowerMatchaCream[];
extern const u32 gMonPalette_AlcremieFlowerMintCream[];
extern const u32 gMonPalette_AlcremieFlowerLemonCream[];
extern const u32 gMonPalette_AlcremieFlowerSaltedCream[];
extern const u32 gMonPalette_AlcremieFlowerRubySwirl[];
extern const u32 gMonPalette_AlcremieFlowerCaramelSwirl[];
extern const u32 gMonPalette_AlcremieFlowerRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieFlower[];
extern const u32 gMonShinyPalette_AlcremieFlower[];
//extern const u8 gMonIcon_AlcremieFlower[];
extern const u32 gMonFrontPic_AlcremieRibbon[];
extern const u32 gMonPalette_AlcremieRibbonVanillaCream[];
extern const u32 gMonPalette_AlcremieRibbonRubyCream[];
extern const u32 gMonPalette_AlcremieRibbonMatchaCream[];
extern const u32 gMonPalette_AlcremieRibbonMintCream[];
extern const u32 gMonPalette_AlcremieRibbonLemonCream[];
extern const u32 gMonPalette_AlcremieRibbonSaltedCream[];
extern const u32 gMonPalette_AlcremieRibbonRubySwirl[];
extern const u32 gMonPalette_AlcremieRibbonCaramelSwirl[];
extern const u32 gMonPalette_AlcremieRibbonRainbowSwirl[];
extern const u32 gMonBackPic_AlcremieRibbon[];
extern const u32 gMonShinyPalette_AlcremieRibbon[];
//extern const u8 gMonIcon_AlcremieRibbon[];
extern const u8 gMonFootprint_Falinks[];
extern const u8 gMonFootprint_Pincurchin[];
extern const u8 gMonFootprint_Snom[];
@@ -11130,6 +11183,11 @@ extern const u32 gBattleAnimSpriteGfx_WoodHammerHammer[];
extern const u32 gBattleAnimSpritePal_WoodHammerHammer[];
extern const u32 gBattleAnimSpriteGfx_Snowflakes[];
extern const u32 gBattleAnimSpritePal_Snowflakes[];
extern const u32 gBattleAnimSpriteGfx_SyrupBlob[];
extern const u32 gBattleAnimSpriteGfx_SyrupShell[];
extern const u32 gBattleAnimSpriteGfx_SyrupSplat[];
extern const u32 gBattleAnimSpritePal_SyrupRed[];
extern const u32 gBattleAnimSpritePal_SyrupYellow[];
extern const u32 gBattleAnimBgImage_Dark[];
extern const u32 gBattleAnimBgImage_Ghost[];