fixes egg moves issue with pokemon that breed with incense in the official games, updates intro screen

This commit is contained in:
chardub
2025-03-06 09:42:48 -05:00
parent 45bf331031
commit 96f60d8cb9
25 changed files with 17 additions and 14 deletions

BIN
.DS_Store vendored

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -225,7 +225,7 @@ class CharacterSelectMenuPresenter
def applyHairEasterEggs()
@hairstyle = HAIR_RIVAL if @name == "Gary" && @gender == 1
@hairstyle = HAIR_BROCK if @name == "Brock" && @gender == 1
@hairstyle = HAIR_MISTY if @name == "Misty" && @gender == 0
@hairstyle = HAIR_MISTY1 if @name == "Misty" && @gender == 0
end

View File

@@ -44,7 +44,7 @@ module Settings
AI_ENTRIES_RATE_LOG_FILE = 'Data/pokedex/rate_limit.log' # Path to the log file
#Spritepack
NEWEST_SPRITEPACK_MONTH = 1
NEWEST_SPRITEPACK_MONTH = 2
NEWEST_SPRITEPACK_YEAR = 2025

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,5 +1,4 @@
1740966216
1740966216
1740966216
1740966228
1740966247
1741272072
1741272072
1741272072
1741272079

View File

@@ -48,3 +48,6 @@ Graphics/CustomBattlers/spritesheets/spritesheets_base/47.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/47/47.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/1/1d.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/222/222a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/372.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/55.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/55/55.png

BIN
Graphics/.DS_Store vendored

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

View File

@@ -8337,7 +8337,7 @@ Abilities = HUGEPOWER,THICKFAT
HiddenAbility = SAPSIPPER
Moves = 1,SPLASH,1,WATERGUN,2,TAILWHIP,5,WATERSPORT,7,BUBBLE,10,CHARM,13,BUBBLEBEAM,16,HELPINGHAND,20,SLAM,23,BOUNCE
TutorMoves = ATTRACT,BLIZZARD,BOUNCE,CONFIDE,COVET,DOUBLETEAM,FACADE,FRUSTRATION,HAIL,HELPINGHAND,HIDDENPOWER,HYPERVOICE,ICEBEAM,ICYWIND,IRONTAIL,KNOCKOFF,LIGHTSCREEN,PROTECT,RAINDANCE,REST,RETURN,ROUND,SCALD,SLEEPTALK,SNORE,SUBSTITUTE,SURF,SWAGGER,TOXIC,UPROAR,WATERFALL,WATERPULSE,WORKUP,SWIFT
EggMoves = BODYSLAM,ENCORE,FAKETEARS,MUDDYWATER,REFRESH,SING,SLAM,SOAK,TICKLE,WATERSPORT
EggMoves = BODYSLAM,ENCORE,FAKETEARS,MUDDYWATER,REFRESH,SING,SLAM,SOAK,TICKLE,WATERSPORT,AMNESIA,AQUAJET,BELLYDRUM,BODYSLAM,FUTURESIGHT,MUDDYWATER,PERISHSONG,PRESENT,REFRESH,SUPERPOWER,SUPERSONIC,WATERSPORT
Compatibility = Undiscovered
StepsToHatch = 2805
Height = 0.2
@@ -8495,7 +8495,7 @@ Abilities = STURDY,ROCKHEAD
HiddenAbility = RATTLED
Moves = 1,FAKETEARS,1,COPYCAT,5,FLAIL,8,LOWKICK,12,ROCKTHROW,15,MIMIC,19,FEINTATTACK,22,TEARFULLOOK,26,ROCKTOMB,29,BLOCK,33,ROCKSLIDE,36,COUNTER,40,SUCKERPUNCH,43,DOUBLEEDGE
TutorMoves = AFTERYOU,ATTRACT,BLOCK,BRICKBREAK,CALMMIND,CONFIDE,COVET,DOUBLETEAM,EARTHPOWER,EXPLOSION,FACADE,FOULPLAY,FRUSTRATION,HELPINGHAND,HIDDENPOWER,LOWKICK,NATUREPOWER,PROTECT,PSYCHUP,REST,RETURN,ROCKPOLISH,ROCKSLIDE,ROCKTOMB,ROLEPLAY,ROUND,SANDSTORM,SLEEPTALK,SMACKDOWN,SNORE,STEALTHROCK,STOMPINGTANTRUM,SUBSTITUTE,SUNNYDAY,SWAGGER,THIEF,TOXIC,UPROAR,DIG,ROLLOUT,SUCKERPUNCH,MEGAKICK
EggMoves = CURSE,DEFENSECURL,ENDURE,HARDEN,HEADBUTT,ROLLOUT,SANDTOMB,SELFDESTRUCT,STEALTHROCK
EggMoves = CURSE,DEFENSECURL,ENDURE,HARDEN,HEADBUTT,ROLLOUT,SANDTOMB,SELFDESTRUCT,STEALTHROCK,CURSE,DEFENSECURL,ENDURE,HARDEN,HEADBUTT,ROLLOUT,SANDTOMB,SELFDESTRUCT,STEALTHROCK
Compatibility = Undiscovered
StepsToHatch = 5355
Height = 0.5
@@ -8528,7 +8528,8 @@ Abilities = SOUNDPROOF,FILTER
HiddenAbility = TECHNICIAN
Moves = 1,BARRIER,1,CONFUSION,1,POUND,1,TICKLE,4,COPYCAT,8,MEDITATE,11,DOUBLESLAP,15,MIMIC,18,ENCORE,22,LIGHTSCREEN,22,REFLECT,25,PSYBEAM,29,SUBSTITUTE,32,RECYCLE,36,TRICK,39,PSYCHIC,43,ROLEPLAY,46,BATONPASS,50,SAFEGUARD
TutorMoves = ALLYSWITCH,ATTRACT,BRICKBREAK,CALMMIND,CHARGEBEAM,CONFIDE,COVET,DOUBLETEAM,DRAINPUNCH,DREAMEATER,FACADE,FLING,FOCUSPUNCH,FRUSTRATION,GRASSKNOT,HELPINGHAND,HIDDENPOWER,ICYWIND,INFESTATION,LIGHTSCREEN,MAGICCOAT,MAGICROOM,PROTECT,PSYCHIC,PSYCHUP,PSYSHOCK,RAINDANCE,RECYCLE,REFLECT,REST,RETURN,ROLEPLAY,ROUND,SAFEGUARD,SHADOWBALL,SHOCKWAVE,SIGNALBEAM,SKILLSWAP,SLEEPTALK,SNATCH,SNORE,SOLARBEAM,SUBSTITUTE,SUNNYDAY,SWAGGER,TAUNT,TELEKINESIS,THIEF,THUNDER,THUNDERBOLT,THUNDERWAVE,TORMENT,TOXIC,TRICK,TRICKROOM,UPROAR,WONDERROOM,FLASH,DRAININGKISS,MUDSLAP,TELEPORT,NASTYPLOT
EggMoves = CHARM,CONFUSERAY,FAKEOUT,FUTURESIGHT,HEALINGWISH,HYPNOSIS,ICYWIND,MAGICROOM,MIMIC,NASTYPLOT,POWERSPLIT,TEETERDANCE,TRICK,WAKEUPSLAP
EggMoves = CHARM,CONFUSERAY,FAKEOUT,FUTURESIGHT,HEALINGWISH,HYPNOSIS,ICYWIND,MAGICROOM,MIMIC,NASTYPLOT,POWERSPLIT,TEETERDANCE,TRICK,WAKEUPSLAP, CONFUSERAY,FAKEOUT,FUTURESIGHT,HYPNOSIS,ICYWIND,MAGICROOM,MIMIC,NASTYPLOT,POWERSPLIT,TEETERDANCE,TRICK,WAKEUPSLAP
Compatibility = Undiscovered
StepsToHatch = 6630
Height = 0.6
@@ -8561,7 +8562,7 @@ Abilities = NATURALCURE,SERENEGRACE
HiddenAbility = FRIENDGUARD
Moves = 1,POUND,1,CHARM,5,COPYCAT,9,REFRESH,12,SWEETKISS
TutorMoves = ATTRACT,CONFIDE,COVET,DOUBLETEAM,DRAINPUNCH,DREAMEATER,ECHOEDVOICE,ENDEAVOR,FACADE,FIREBLAST,FLAMETHROWER,FLING,FRUSTRATION,GRASSKNOT,GRAVITY,HAIL,HEALBELL,HELPINGHAND,HIDDENPOWER,HYPERVOICE,ICYWIND,LASTRESORT,LIGHTSCREEN,PROTECT,PSYCHIC,PSYCHUP,RAINDANCE,RECYCLE,REST,RETURN,ROUND,SAFEGUARD,SHADOWBALL,SHOCKWAVE,SLEEPTALK,SNORE,SOLARBEAM,SUBSTITUTE,SUNNYDAY,SWAGGER,THUNDERWAVE,TOXIC,UPROAR,WATERPULSE,WORKUP,ZENHEADBUTT,INCINERATE,FLASH,DRAININGKISS,MUDSLAP,ROLLOUT
EggMoves = AROMATHERAPY,COUNTER,ENDURE,GRAVITY,HEALBELL,HELPINGHAND,LASTRESORT,METRONOME,MUDBOMB,NATURALGIFT,PRESENT
EggMoves = AROMATHERAPY,COUNTER,ENDURE,GRAVITY,HEALBELL,HELPINGHAND,LASTRESORT,METRONOME,MUDBOMB,NATURALGIFT,PRESENT, AROMATHERAPY,COUNTER,ENDURE,GRAVITY,HEALBELL,HELPINGHAND,METRONOME,MUDBOMB,NATURALGIFT,PRESENT
Compatibility = Undiscovered
StepsToHatch = 10455
Height = 0.6
@@ -8595,7 +8596,7 @@ Abilities = PICKUP,THICKFAT
HiddenAbility = GLUTTONY
Moves = 1,LASTRESORT,1,RECYCLE,1,LICK,1,METRONOME,1,ODORSLEUTH,1,TACKLE,4,DEFENSECURL,9,AMNESIA,12,LICK,17,CHIPAWAY,20,SCREECH,25,BODYSLAM,28,STOCKPILE,33,SWALLOW,36,ROLLOUT,41,FLING,44,BELLYDRUM,49,NATURALGIFT,50,SNATCH,57,LASTRESORT
TutorMoves = AFTERYOU,ATTRACT,BLIZZARD,BRICKBREAK,BULLDOZE,CONFIDE,COVET,DOUBLETEAM,EARTHQUAKE,FACADE,FIREBLAST,FIREPUNCH,FLAMETHROWER,FLING,FOCUSPUNCH,FRUSTRATION,GUNKSHOT,HIDDENPOWER,HYPERVOICE,ICEBEAM,ICEPUNCH,ICYWIND,LASTRESORT,POWERUPPUNCH,PROTECT,PSYCHIC,RAINDANCE,RECYCLE,REST,RETURN,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROUND,SANDSTORM,SEEDBOMB,SHADOWBALL,SHOCKWAVE,SLEEPTALK,SNATCH,SNORE,SOLARBEAM,STOMPINGTANTRUM,STRENGTH,SUBSTITUTE,SUNNYDAY,SUPERPOWER,SURF,SWAGGER,THUNDER,THUNDERBOLT,THUNDERPUNCH,TOXIC,UPROAR,WATERPULSE,WORKUP,ZENHEADBUTT,INCINERATE,RETALIATE,DRAININGKISS,MUDSLAP,ROLLOUT,ROCKCLIMB
EggMoves = AFTERYOU,CHARM,COUNTER,CURSE,DOUBLEEDGE,FISSURE,LICK,NATURALGIFT,PURSUIT,SELFDESTRUCT,WHIRLWIND,ZENHEADBUTT
EggMoves = AFTERYOU,CHARM,COUNTER,CURSE,DOUBLEEDGE,FISSURE,LICK,NATURALGIFT,PURSUIT,SELFDESTRUCT,WHIRLWIND,ZENHEADBUTT,AFTERYOU,CHARM,COUNTER,CURSE,DOUBLEEDGE,FISSURE,LICK,NATURALGIFT,PURSUIT,SELFDESTRUCT,WHIRLWIND,ZENHEADBUTT
Compatibility = Undiscovered
StepsToHatch = 10455
Height = 0.6
@@ -8630,7 +8631,7 @@ Abilities = SWIFTSWIM,WATERABSORB
HiddenAbility = WATERVEIL
Moves = 1,TACKLE,1,BUBBLE,3,SUPERSONIC,7,BUBBLEBEAM,11,CONFUSERAY,14,WINGATTACK,16,HEADBUTT,19,WATERPULSE,23,WIDEGUARD,27,TAKEDOWN,32,AGILITY,36,AIRSLASH,39,AQUARING,46,BOUNCE,49,HYDROPUMP
TutorMoves = ACROBATICS,AERIALACE,ATTRACT,BLIZZARD,BOUNCE,BULLDOZE,CONFIDE,DIVE,DOUBLETEAM,EARTHQUAKE,FACADE,FRUSTRATION,HAIL,HELPINGHAND,HIDDENPOWER,ICEBEAM,ICYWIND,PROTECT,RAINDANCE,REST,RETURN,ROCKSLIDE,ROUND,SCALD,SIGNALBEAM,SLEEPTALK,SNORE,SUBSTITUTE,SURF,SWAGGER,TAILWIND,TOXIC,WATERFALL,WATERPULSE,AIRCUTTER,MUDSLAP,SWIFT
EggMoves = AMNESIA,HAZE,HYDROPUMP,MIRRORCOAT,MUDSPORT,SIGNALBEAM,SLAM,SPLASH,TWISTER,WATERSPORT,WIDEGUARD
EggMoves = AMNESIA,HAZE,HYDROPUMP,MIRRORCOAT,MUDSPORT,SIGNALBEAM,SLAM,SPLASH,TWISTER,WATERSPORT,WIDEGUARD, AMNESIA,HAZE,HYDROPUMP,MIRRORCOAT,MUDSPORT,SLAM,SPLASH,TWISTER,WATERSPORT,WIDEGUARD
Compatibility = Undiscovered
StepsToHatch = 6630
Height = 1.0
@@ -13106,7 +13107,7 @@ Abilities = NATURALCURE,POISONPOINT
HiddenAbility = LEAFGUARD
Moves = 1,ABSORB,4,GROWTH,7,WATERSPORT,10,STUNSPORE,13,MEGADRAIN,16,WORRYSEED
TutorMoves = ATTRACT,CONFIDE,COVET,CUT,DAZZLINGGLEAM,DOUBLETEAM,ENERGYBALL,FACADE,FRUSTRATION,GIGADRAIN,GRASSKNOT,HIDDENPOWER,NATUREPOWER,PROTECT,PSYCHUP,RAINDANCE,REST,RETURN,ROUND,SEEDBOMB,SHADOWBALL,SLEEPTALK,SLUDGEBOMB,SNORE,SOLARBEAM,SUBSTITUTE,SUNNYDAY,SWAGGER,SWORDSDANCE,SYNTHESIS,TOXIC,UPROAR,VENOSHOCK,WORRYSEED,FLASH,MUDSLAP,SWIFT
EggMoves = COTTONSPORE,EXTRASENSORY,GIGADRAIN,GRASSWHISTLE,LEAFSTORM,MINDREADER,NATURALGIFT,PINMISSILE,RAZORLEAF,SEEDBOMB,SLEEPPOWDER,SPIKES,SYNTHESIS
EggMoves = COTTONSPORE,EXTRASENSORY,GIGADRAIN,GRASSWHISTLE,LEAFSTORM,MINDREADER,NATURALGIFT,PINMISSILE,RAZORLEAF,SEEDBOMB,SLEEPPOWDER,SPIKES,SYNTHESIS, COTTONSPORE,GIGADRAIN,GRASSWHISTLE,LEAFSTORM,MINDREADER,NATURALGIFT,PINMISSILE,RAZORLEAF,SEEDBOMB,SLEEPPOWDER,SPIKES,SYNTHESIS
Compatibility = Undiscovered
StepsToHatch = 5355
Height = 0.2