Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-20 09:05:46 -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

1
include/battle.h
View File

@@ -106,6 +106,7 @@ struct DisableStruct
u8 stickyWebDone:1;
u8 stealthRockDone:1;
u8 syrupBombTimer;
u8 syrupBombIsShiny:1;
u8 steelSurgeDone:1;
};

1
include/battle_scripts.h
View File

@@ -481,6 +481,7 @@ extern const u8 BattleScript_SelectingNotAllowedCurrentMove[];
extern const u8 BattleScript_SelectingNotAllowedCurrentMoveInPalace[];
extern const u8 BattleScript_SaltCureExtraDamage[];
extern const u8 BattleScript_SyrupBombEndTurn[];
extern const u8 BattleScript_SyrupBombActivates[];
// zmoves
extern const u8 BattleScript_ZMoveActivateDamaging[];

4
include/config/battle.h
View File

@@ -117,7 +117,6 @@
#define B_SHADOW_TAG_ESCAPE GEN_LATEST // In Gen4+, if both sides have a Pokémon with Shadow Tag, all battlers can escape. Before, neither side could escape this situation.
#define B_MOODY_ACC_EVASION GEN_LATEST // In Gen8, Moody CANNOT raise Accuracy and Evasion anymore.
#define B_FLASH_FIRE_FROZEN GEN_LATEST // In Gen5+, Flash Fire can trigger even when frozen, when it couldn't before.
#define B_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. In Gen9, it has no out-of-battle effect.
#define B_SYNCHRONIZE_TOXIC GEN_LATEST // In Gen5+, if a Pokémon with Synchronize is badly poisoned, the opponent will also become badly poisoned. Previously, the opponent would become regular poisoned.
#define B_UPDATED_INTIMIDATE GEN_LATEST // In Gen8, Intimidate doesn't work on opponents with the Inner Focus, Scrappy, Own Tempo or Oblivious abilities. It also activates Rattled.
#define B_OBLIVIOUS_TAUNT GEN_LATEST // In Gen6+, Pokémon with Oblivious can't be taunted.
@@ -129,6 +128,7 @@
#define B_LEAF_GUARD_PREVENTS_REST GEN_LATEST // In Gen5+, Leaf Guard prevents the use of Rest in harsh sunlight.
#define B_SNOW_WARNING GEN_LATEST // In Gen9+, Snow Warning will summon snow instead of hail.
#define B_TRANSISTOR_BOOST GEN_LATEST // In Gen9+, Transistor will only boost Electric-type moves by 1.3x as opposed to 1.5x.
#define B_ILLUMINATE_EFFECT GEN_LATEST // In Gen9+, Illuminate prevents accuracy reductions and ignores the target's evasion.
// Item settings
#define B_HP_BERRIES GEN_LATEST // In Gen4+, berries which restore HP activate immediately after HP drops to half. In Gen3, the effect occurs at the end of the turn.
@@ -209,7 +209,7 @@
#define B_WILD_NATURAL_ENEMIES TRUE // If set to TRUE, certain wild mon species will attack other species when partnered in double wild battles (eg. Zangoose vs Seviper)
#define B_AFFECTION_MECHANICS FALSE // In Gen6+, there's a stat called affection that can trigger different effects in battle. From LGPE onwards, those effects use friendship instead.
#define B_TRAINER_CLASS_POKE_BALLS GEN_LATEST // In Gen7+, trainers will use certain types of Poké Balls depending on their trainer class.
#define B_OBEDIENCE_MECHANICS GEN_7 // In PLA+ (here Gen8+), obedience restrictions also apply to non-outsider Pokémon, albeit based on their level met rather than actual level
#define B_OBEDIENCE_MECHANICS GEN_LATEST // In PLA+ (here Gen8+), obedience restrictions also apply to non-outsider Pokémon, albeit based on their level met rather than actual level
#define B_USE_FROSTBITE FALSE // In PLA, Frostbite replaces Freeze. Enabling this flag does the same here. Moves can still be cherry-picked to either Freeze or Frostbite. Freeze-Dry, Secret Power & Tri Attack depend on this config.
#define B_OVERWORLD_SNOW GEN_LATEST // In Gen9+, overworld Snow will summon snow instead of hail.

14
include/config/overworld.h
View File

@@ -10,6 +10,20 @@
// PC settings
#define OW_PC_PRESS_B GEN_LATEST // In Gen4, pressing B when holding a Pokémon is equivalent to placing it. In Gen3, it gives the "You're holding a Pokémon!" error.
// Out-of-battle Ability effects
#define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect.
#define OW_COMPOUND_EYES GEN_LATEST // Prior to Gen9, if a Pokémon with Compound Eyes is leading the party, the wild held item rate is increased to 60%/20%.
#define OW_SUPER_LUCK GEN_LATEST // In Gen8, if a Pokémon with Super Luck is leading the party, the wild held item rate is increased to 60%/20%.
#define OW_CUTE_CHARM GEN_LATEST // Prior to Gen9, if a Pokémon with Cute Charm is leading the party, wild encounters have a 66.7% chance to be forced to be of the opposite gender.
#define OW_ILLUMINATE GEN_LATEST // Prior to Gen9, if a Pokémon with Illuminate is leading the party, the wild encounter rate is doubled.
#define OW_INFILTRATOR GEN_LATEST // In Gen8, if a Pokémon with Infiltrator is leading the party, the wild encounter rate is halved.
#define OW_HARVEST GEN_LATEST // In Gen8, if a Pokémon with Harvest is leading the party, there is a 50% chance to encounter a Grass-type Pokémon.
#define OW_LIGHTNING_ROD GEN_LATEST // In Gen8, if a Pokémon with Lightning Rod is leading the party, there is a 50% chance to encounter an Electric-type Pokémon.
#define OW_STORM_DRAIN GEN_LATEST // In Gen8, if a Pokémon with Storm Drain is leading the party, there is a 50% chance to encounter a Water-type Pokémon.
#define OW_FLASH_FIRE GEN_LATEST // In Gen8, if a Pokémon with Flash Fire is leading the party, there is a 50% chance to encounter a Fire-type Pokémon.
#define OW_MAGNET_PULL GEN_LATEST // Prior to Gen9, if a Pokémon with Magnet Pull is leading the party, there is a 50% chance to encounter a Steel-type Pokémon.
#define OW_STATIC GEN_LATEST // Prior to Gen9, if a Pokémon with Static is leading the party, there is a 50% chance to encounter an Electric-type Pokémon.
// Overworld flags
// To use the following features in scripting, replace the 0s with the flag ID you're assigning it to.
// Eg: Replace with FLAG_UNUSED_0x264 so you can use that flag to toggle the feature.

8
include/constants/battle_anim.h
View File

@@ -399,7 +399,12 @@
#define ANIM_TAG_TEAPOT (ANIM_SPRITES_START + 385)
#define ANIM_TAG_WOOD_HAMMER_HAMMER (ANIM_SPRITES_START + 386)
#define ANIM_TAG_SNOWFLAKES (ANIM_SPRITES_START + 387)
#define ANIM_TAG_SYRUP_BLOB_RED (ANIM_SPRITES_START + 388)
#define ANIM_TAG_SYRUP_SHELL_RED (ANIM_SPRITES_START + 389)
#define ANIM_TAG_SYRUP_BLOB_YELLOW (ANIM_SPRITES_START + 390)
#define ANIM_TAG_SYRUP_SHELL_YELLOW (ANIM_SPRITES_START + 391)
#define ANIM_TAG_SYRUP_SPLAT_RED (ANIM_SPRITES_START + 392)
#define ANIM_TAG_SYRUP_SPLAT_YELLOW (ANIM_SPRITES_START + 393)
// battlers
#define ANIM_ATTACKER 0
@@ -553,6 +558,7 @@
#define B_ANIM_SALT_CURE_DAMAGE 38
#define B_ANIM_DYNAMAX_GROWTH 39
#define B_ANIM_MAX_SET_WEATHER 40
#define B_ANIM_SYRUP_BOMB_SPEED_DROP 41
// special animations table (gBattleAnims_Special)
#define B_ANIM_LVL_UP 0

55
include/constants/battle_script_commands.h
View File

@@ -221,34 +221,33 @@
#define VARIOUS_TRY_TAR_SHOT 128
#define VARIOUS_CAN_TAR_SHOT_WORK 129
#define VARIOUS_CHECK_POLTERGEIST 130
#define VARIOUS_SET_OCTOLOCK 131
#define VARIOUS_CUT_1_3_HP_RAISE_STATS 132
#define VARIOUS_TRY_END_NEUTRALIZING_GAS 133
#define VARIOUS_JUMP_IF_UNDER_200 134
#define VARIOUS_SET_SKY_DROP 135
#define VARIOUS_CLEAR_SKY_DROP 136
#define VARIOUS_SKY_DROP_YAWN 137
#define VARIOUS_JUMP_IF_HOLD_EFFECT 138
#define VARIOUS_CURE_CERTAIN_STATUSES 139
#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 140
#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 141
#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 142
#define VARIOUS_SAVE_BATTLER_ITEM 143
#define VARIOUS_RESTORE_BATTLER_ITEM 144
#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 145
#define VARIOUS_SET_BEAK_BLAST 146
#define VARIOUS_SWAP_SIDE_STATUSES 147
#define VARIOUS_SWAP_STATS 148
#define VARIOUS_TEATIME_INVUL 149
#define VARIOUS_TEATIME_TARGETS 150
#define VARIOUS_TRY_WIND_RIDER_POWER 151
#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 152
#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 153
#define VARIOUS_STORE_HEALING_WISH 154
#define VARIOUS_HIT_SWITCH_TARGET_FAILED 155
#define VARIOUS_TRY_REVIVAL_BLESSING 156
#define VARIOUS_TRY_TRAINER_SLIDE_MSG_Z_MOVE 157
#define VARIOUS_TRY_TRAINER_SLIDE_MSG_MEGA_EVOLUTION 158
#define VARIOUS_CUT_1_3_HP_RAISE_STATS 131
#define VARIOUS_TRY_END_NEUTRALIZING_GAS 132
#define VARIOUS_JUMP_IF_UNDER_200 133
#define VARIOUS_SET_SKY_DROP 134
#define VARIOUS_CLEAR_SKY_DROP 135
#define VARIOUS_SKY_DROP_YAWN 136
#define VARIOUS_JUMP_IF_HOLD_EFFECT 137
#define VARIOUS_CURE_CERTAIN_STATUSES 138
#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 139
#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 140
#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 141
#define VARIOUS_SAVE_BATTLER_ITEM 142
#define VARIOUS_RESTORE_BATTLER_ITEM 143
#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 144
#define VARIOUS_SET_BEAK_BLAST 145
#define VARIOUS_SWAP_SIDE_STATUSES 146
#define VARIOUS_SWAP_STATS 147
#define VARIOUS_TEATIME_INVUL 148
#define VARIOUS_TEATIME_TARGETS 149
#define VARIOUS_TRY_WIND_RIDER_POWER 150
#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 151
#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 152
#define VARIOUS_STORE_HEALING_WISH 153
#define VARIOUS_HIT_SWITCH_TARGET_FAILED 154
#define VARIOUS_TRY_REVIVAL_BLESSING 155
#define VARIOUS_TRY_TRAINER_SLIDE_MSG_Z_MOVE 156
#define VARIOUS_TRY_TRAINER_SLIDE_MSG_MEGA_EVOLUTION 157
// Cmd_manipulatedamage
#define DMG_CHANGE_SIGN 0

2
include/constants/battle_string_ids.h
View File

@@ -547,7 +547,7 @@
#define STRINGID_NOONEWILLBEABLETORUNAWAY 545
#define STRINGID_DESTINYKNOTACTIVATES 546
#define STRINGID_CLOAKEDINAFREEZINGLIGHT 547
#define STRINGID_STATWASNOTLOWERED 548
#define STRINGID_CLEARAMULETWONTLOWERSTATS 548
#define STRINGID_FERVENTWISHREACHED 549
#define STRINGID_AIRLOCKACTIVATES 550
#define STRINGID_PRESSUREENTERS 551

2914
include/constants/species.h
View File

File diff suppressed because it is too large Load Diff

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[];

1
include/wild_encounter.h
View File

@@ -31,6 +31,7 @@ extern bool8 gIsFishingEncounter;
extern bool8 gIsSurfingEncounter;
void DisableWildEncounters(bool8 disabled);
u8 PickWildMonNature(void);
bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavior);
bool8 SweetScentWildEncounter(void);
bool8 DoesCurrentMapHaveFishingMons(void);