Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion

Browse Source
This commit is contained in:
Bassoonian 2023-12-07 12:18:50 +01:00
commit c8d356a3f1
211 changed files with 3437 additions and 1522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

@ -1,8 +1,14 @@
# pokeemerald Expansion # pokeemerald-expansion
## What is the pokeemerald Expansion? ## What is pokeemerald-expansion?
The pokeemerald Expansion is a decomp hack base project based off pret's [pokeemerald](https://github.com/pret/pokeemerald) decompilation project. It's recommended that any new projects that plan on using it, to clone this repository instead of pret's vanilla repository, as we regurlarly incorporate pret's documentation changes. This is ***NOT*** a standalone romhack, and as such, most features will be unavailable and/or unbalanced if played as is. pokeemerald-expansion is a decomp hack base project based off pret's [pokeemerald](https://github.com/pret/pokeemerald) decompilation project. It's recommended that any new projects that plan on using it, to clone this repository instead of pret's vanilla repository, as we regurlarly incorporate pret's documentation changes. This is ***NOT*** a standalone romhack, and as such, most features will be unavailable and/or unbalanced if played as is.
If you use pokeemerald-expansion in your hack, please add RHH (Rom Hacking Hideout) to your credits list. Optionally, you can list the version used, so it can help players know what features to expect.
You can phrase it as the following:
```
Based off RHH's pokeemerald-expansion v1.6.2 https://github.com/rh-hideout/pokeemerald-expansion/
```
## What features are included? ## What features are included?
- ***IMPORTANT*❗❗ Read through these to learn what features you can toggle**: - ***IMPORTANT*❗❗ Read through these to learn what features you can toggle**:
@ -136,14 +142,14 @@ There are some mechanics, moves and abilities that are missing and being develop
### [Documentation on features can be found here](https://github.com/rh-hideout/pokeemerald-expansion/wiki) ### [Documentation on features can be found here](https://github.com/rh-hideout/pokeemerald-expansion/wiki)
## If I already have a project based on regular pokeemerald, can I use the pokeemerald Expansion ## If I already have a project based on regular pokeemerald, can I use pokeemerald-expansion?
Yes! Keep in mind that we keep up with pret's documentation of pokeemerald, which means that if your project a bit old, you might get merge conflicts that you need to solve manually. Yes! Keep in mind that we keep up with pret's documentation of pokeemerald, which means that if your project a bit old, you might get merge conflicts that you need to solve manually.
- If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`. - If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`.
- Once you have your remote set up, run the command `git pull RHH master`. - Once you have your remote set up, run the command `git pull RHH master`.
With this, you'll get the latest version of the Expansion, plus a couple of bugfixes that haven't been released into the next patch version :) With this, you'll get the latest version of pokeemerald-expansion, plus a couple of bugfixes that haven't been released into the next patch version :)
## **How do I update my version of the pokeemerald Expansion?** ## **How do I update my version of pokeemerald-expansion?**
- If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`. - If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`.
- Once you have your remote set up, run the command `git pull RHH expansion/1.6.2`. - Once you have your remote set up, run the command `git pull RHH expansion/1.6.2`.
@ -162,7 +168,7 @@ The project was originally started by DizzyEgg alongside other contributors.
The project has now gotten larger and DizzyEgg is now maintaining the project as part of the ROM Hacking Hideout community. Some members of this community are taking on larger roles to help maintain the project. The project has now gotten larger and DizzyEgg is now maintaining the project as part of the ROM Hacking Hideout community. Some members of this community are taking on larger roles to help maintain the project.
## What is ROM Hacking Hideout? ## What is the ROM Hacking Hideout?
A Discord-based ROM hacking community that has many members who hack using the disassembly and decompilation projects for Pokémon. Quite a few contributors to the original feature branches by DizzyEgg were members of ROM Hacking Hideout. You can call it RHH for short! A Discord-based ROM hacking community that has many members who hack using the disassembly and decompilation projects for Pokémon. Quite a few contributors to the original feature branches by DizzyEgg were members of ROM Hacking Hideout. You can call it RHH for short!

10
asm/macros/battle_script.inc
View File

@ -1541,6 +1541,11 @@
callnative BS_TryTrainerSlideDynamaxMsg callnative BS_TryTrainerSlideDynamaxMsg
.endm .endm
.macro tryhealpulse failInstr:req
callnative BS_TryHealPulse
.4byte \failInstr
.endm
@ various command changed to more readable macros @ various command changed to more readable macros
.macro cancelmultiturnmoves battler:req .macro cancelmultiturnmoves battler:req
various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
@ -1732,11 +1737,6 @@
various \battler, VARIOUS_SET_LAST_USED_ABILITY various \battler, VARIOUS_SET_LAST_USED_ABILITY
.endm .endm
.macro tryhealpulse battler:req, failInstr:req
various \battler, VARIOUS_TRY_HEAL_PULSE
.4byte \failInstr
.endm
.macro tryquash failInstr:req .macro tryquash failInstr:req
various BS_ATTACKER, VARIOUS_TRY_QUASH various BS_ATTACKER, VARIOUS_TRY_QUASH
.4byte \failInstr .4byte \failInstr

2
asm/macros/movement.inc
View File

@ -162,5 +162,7 @@
create_movement_action figure_8, MOVEMENT_ACTION_FIGURE_8 create_movement_action figure_8, MOVEMENT_ACTION_FIGURE_8
create_movement_action fly_up, MOVEMENT_ACTION_FLY_UP create_movement_action fly_up, MOVEMENT_ACTION_FLY_UP
create_movement_action fly_down, MOVEMENT_ACTION_FLY_DOWN create_movement_action fly_down, MOVEMENT_ACTION_FLY_DOWN
create_movement_action emote_double_exclamation_mark, MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK
create_movement_action emote_x, MOVEMENT_ACTION_EMOTE_X
create_movement_action step_end, MOVEMENT_ACTION_STEP_END create_movement_action step_end, MOVEMENT_ACTION_STEP_END

72
data/battle_anim_scripts.s
View File

@ -16835,6 +16835,77 @@ SyrupBombSpeedDropYellow:
waitforvisualfinish waitforvisualfinish
end end
Move_CHILLY_RECEPTION::
loadspritegfx ANIM_TAG_CONFETTI
loadspritegfx ANIM_TAG_PINK_CLOUD
loadspritegfx ANIM_TAG_ICE_CRYSTALS
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, ANIM_ATTACKER, 1
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 1, 0, 13, RGB_BLACK
delay 60
waitforvisualfinish
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 1, 13, 0, RGB_BLACK
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7
waitforvisualfinish
createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_ROAR
setalpha 12, 4
monbg ANIM_ATTACKER
playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 24
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, 6, 24
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 120, 3, -12, 12, 24
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 119, 3, 14, 18, 24
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 118, 3, 0, 0, 24
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
waitforvisualfinish
clearmonbg ANIM_ATTACKER
delay 10
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 1, 0, 3, RGB_WHITE
playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER
call ChillyReceptionSnowballs
call ChillyReceptionSnowballs
call ChillyReceptionSnowballs
call ChillyReceptionSnowballs
playsewithpan SE_M_GUST2, SOUND_PAN_TARGET
waitforvisualfinish
waitsound
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 1, 3, 0, RGB_WHITE
end
ChillyReceptionSnowballs:
createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -150, 24, 0, 56, 4, 4, 0
delay 3
createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -100, 24, -10, 56, 4, 4, 0
delay 3
createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -100, 24, 10, 56, -4, 3, 0
delay 3
createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -200, 24, -20, 56, -4, 5, 0
delay 3
createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -150, 24, 15, 56, 4, 4, 0
delay 3
createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -200, 24, -20, 56, 4, 4, 0
delay 3
createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -200, 24, 20, 56, 4, 4, 0
delay 3
return
Move_TERA_BLAST:: Move_TERA_BLAST::
Move_AXE_KICK:: Move_AXE_KICK::
Move_LAST_RESPECTS:: Move_LAST_RESPECTS::
@ -16862,7 +16933,6 @@ Move_RUINATION::
Move_COLLISION_COURSE:: Move_COLLISION_COURSE::
Move_ELECTRO_DRIFT:: Move_ELECTRO_DRIFT::
Move_SHED_TAIL:: Move_SHED_TAIL::
Move_CHILLY_RECEPTION::
Move_TIDY_UP:: Move_TIDY_UP::
Move_POUNCE:: Move_POUNCE::
Move_TRAILBLAZE:: Move_TRAILBLAZE::

152
data/battle_scripts_1.s
View File

@ -436,6 +436,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_POPULATION_BOMB .4byte BattleScript_EffectHit @ EFFECT_POPULATION_BOMB
.4byte BattleScript_EffectMortalSpin @ EFFECT_MORTAL_SPIN .4byte BattleScript_EffectMortalSpin @ EFFECT_MORTAL_SPIN
.4byte BattleScript_EffectSaltCure @ EFFECT_SALT_CURE .4byte BattleScript_EffectSaltCure @ EFFECT_SALT_CURE
.4byte BattleScript_EffectChillyReception @ EFFECT_CHILLY_RECEPTION
.4byte BattleScript_EffectMatchaGotcha @ EFFECT_MATCHA_GOTCHA .4byte BattleScript_EffectMatchaGotcha @ EFFECT_MATCHA_GOTCHA
.4byte BattleScript_EffectSyrupBomb @ EFFECT_SYRUP_BOMB .4byte BattleScript_EffectSyrupBomb @ EFFECT_SYRUP_BOMB
.4byte BattleScript_EffectHit @ EFFECT_IVY_CUDGEL .4byte BattleScript_EffectHit @ EFFECT_IVY_CUDGEL
@ -471,6 +472,71 @@ BattleScript_SyrupBombTurnDmgEnd:
BattleScript_EffectMatchaGotcha:: BattleScript_EffectMatchaGotcha::
setmoveeffect MOVE_EFFECT_BURN setmoveeffect MOVE_EFFECT_BURN
goto BattleScript_EffectAbsorb goto BattleScript_EffectAbsorb
end
BattleScript_EffectChillyReception::
printstring STRINGID_PKMNTELLCHILLINGRECEPTIONJOKE
waitmessage B_WAIT_TIME_LONG
attackcanceler
ppreduce
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_EffectChillyReceptionBlockedByPrimalSun
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_EffectChillyReceptionBlockedByPrimalRain
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_EffectChillyReceptionBlockedByStrongWinds
call BattleScript_EffectChillyReceptionPlayAnimation
setsnow
call BattleScript_MoveWeatherChangeRet
goto BattleScript_MoveSwitch
BattleScript_EffectChillyReceptionPlayAnimation:
attackstring
attackanimation
waitanimation
return
BattleScript_EffectChillyReceptionBlockedByPrimalSun:
call BattleScript_EffectChillyReceptionTrySwitchWeatherFailed
call BattleScript_ExtremelyHarshSunlightWasNotLessenedRet
goto BattleScript_MoveSwitch
BattleScript_EffectChillyReceptionBlockedByPrimalRain:
call BattleScript_EffectChillyReceptionTrySwitchWeatherFailed
call BattleScript_NoReliefFromHeavyRainRet
goto BattleScript_MoveSwitch
BattleScript_EffectChillyReceptionBlockedByStrongWinds:
call BattleScript_EffectChillyReceptionTrySwitchWeatherFailed
call BattleScript_MysteriousAirCurrentBlowsOnRet
goto BattleScript_MoveSwitch
BattleScript_EffectChillyReceptionTrySwitchWeatherFailed:
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_FailedFromAtkString
jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_FailedFromAtkString
call BattleScript_EffectChillyReceptionPlayAnimation
return
BattleScript_CheckPrimalWeather:
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
return
BattleScript_MoveSwitch:
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_MoveSwitchEnd
jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_MoveSwitchEnd
printstring STRINGID_PKMNWENTBACK
waitmessage B_WAIT_TIME_SHORT
openpartyscreen BS_ATTACKER, BattleScript_MoveSwitchEnd
switchoutabilities BS_ATTACKER
waitstate
switchhandleorder BS_ATTACKER, 2
returntoball BS_ATTACKER
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE
waitstate
switchineffects BS_ATTACKER
BattleScript_MoveSwitchEnd:
end
BattleScript_EffectPledge:: BattleScript_EffectPledge::
attackcanceler attackcanceler
@ -661,14 +727,14 @@ BattleScript_EffectRevivalBlessing::
waitanimation waitanimation
printstring STRINGID_PKMNREVIVEDREADYTOFIGHT printstring STRINGID_PKMNREVIVEDREADYTOFIGHT
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_EffectRevivalBlessingSendOut jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_EffectRevivalBlessingSendOut
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectRevivalBlessingSendOut: BattleScript_EffectRevivalBlessingSendOut:
switchinanim BS_SCRIPTING, FALSE switchinanim BS_SCRIPTING, FALSE
waitstate waitstate
switchineffects BS_SCRIPTING switchineffects BS_SCRIPTING
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_StealthRockActivates:: BattleScript_StealthRockActivates::
setstealthrock BattleScript_MoveEnd setstealthrock BattleScript_MoveEnd
@ -749,10 +815,10 @@ BattleScript_TeatimeLoop:
jumpifabsorbaffected BS_TARGET, BattleScript_Teatimesorb jumpifabsorbaffected BS_TARGET, BattleScript_Teatimesorb
jumpifmotoraffected BS_TARGET, BattleScript_Teatimemotor jumpifmotoraffected BS_TARGET, BattleScript_Teatimemotor
jumpifteainvulnerable BS_TARGET, BattleScript_Teatimevul @ in semi-invulnerable state OR held item is not a Berry jumpifteainvulnerable BS_TARGET, BattleScript_Teatimevul @ in semi-invulnerable state OR held item is not a Berry
orword gHitMarker, HITMARKER_NO_ANIMATIONS | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE orword gHitMarker, HITMARKER_DISABLE_ANIMATION | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
setbyte sBERRY_OVERRIDE, TRUE @ override the requirements for eating berries setbyte sBERRY_OVERRIDE, TRUE @ override the requirements for eating berries
consumeberry BS_TARGET, TRUE @ consume the berry, then restore the item from changedItems consumeberry BS_TARGET, TRUE @ consume the berry, then restore the item from changedItems
bicword gHitMarker, HITMARKER_NO_ANIMATIONS | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE bicword gHitMarker, HITMARKER_DISABLE_ANIMATION | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
setbyte sBERRY_OVERRIDE, FALSE setbyte sBERRY_OVERRIDE, FALSE
removeitem BS_TARGET removeitem BS_TARGET
moveendto MOVEEND_NEXT_TARGET moveendto MOVEEND_NEXT_TARGET
@ -1052,9 +1118,9 @@ BattleScript_EffectFlingConsumeBerry:
savebattleritem BS_TARGET savebattleritem BS_TARGET
battleritemtolastuseditem BS_TARGET battleritemtolastuseditem BS_TARGET
setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries
orword gHitMarker, HITMARKER_NO_ANIMATIONS orword gHitMarker, HITMARKER_DISABLE_ANIMATION
consumeberry BS_TARGET, TRUE consumeberry BS_TARGET, TRUE
bicword gHitMarker, HITMARKER_NO_ANIMATIONS bicword gHitMarker, HITMARKER_DISABLE_ANIMATION
setbyte sBERRY_OVERRIDE, 0 setbyte sBERRY_OVERRIDE, 0
restorebattleritem BS_TARGET restorebattleritem BS_TARGET
BattleScript_FlingEnd: BattleScript_FlingEnd:
@ -1327,9 +1393,9 @@ BattleScript_EffectStuffCheeks::
waitanimation waitanimation
BattleScript_StuffCheeksEatBerry: BattleScript_StuffCheeksEatBerry:
setbyte sBERRY_OVERRIDE, 1 setbyte sBERRY_OVERRIDE, 1
orword gHitMarker, HITMARKER_NO_ANIMATIONS orword gHitMarker, HITMARKER_DISABLE_ANIMATION
consumeberry BS_ATTACKER, TRUE consumeberry BS_ATTACKER, TRUE
bicword gHitMarker, HITMARKER_NO_ANIMATIONS bicword gHitMarker, HITMARKER_DISABLE_ANIMATION
setbyte sBERRY_OVERRIDE, 0 setbyte sBERRY_OVERRIDE, 0
removeitem BS_ATTACKER removeitem BS_ATTACKER
setstatchanger STAT_DEF, 2, FALSE setstatchanger STAT_DEF, 2, FALSE
@ -1593,11 +1659,11 @@ BattleScript_MoveEffectIncinerate::
BattleScript_MoveEffectBugBite:: BattleScript_MoveEffectBugBite::
printstring STRINGID_BUGBITE printstring STRINGID_BUGBITE
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
orword gHitMarker, HITMARKER_NO_ANIMATIONS orword gHitMarker, HITMARKER_DISABLE_ANIMATION
setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries
savetarget savetarget
consumeberry BS_ATTACKER, FALSE consumeberry BS_ATTACKER, FALSE
bicword gHitMarker, HITMARKER_NO_ANIMATIONS bicword gHitMarker, HITMARKER_DISABLE_ANIMATION
setbyte sBERRY_OVERRIDE, 0 setbyte sBERRY_OVERRIDE, 0
trysymbiosis trysymbiosis
restoretarget restoretarget
@ -1696,22 +1762,7 @@ BattleScript_EffectPartingShotTrySpAtk:
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_EffectPartingShotSwitch: BattleScript_EffectPartingShotSwitch:
moveendall moveendall
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_PartingShotEnd goto BattleScript_MoveSwitch
jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_PartingShotEnd
openpartyscreen BS_ATTACKER, BattleScript_PartingShotEnd
switchoutabilities BS_ATTACKER
waitstate
switchhandleorder BS_ATTACKER, 2
returntoball BS_ATTACKER
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
trytoclearprimalweather
flushtextbox
printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE
waitstate
switchineffects BS_ATTACKER
BattleScript_PartingShotEnd: BattleScript_PartingShotEnd:
end end
@ -2712,7 +2763,7 @@ BattleScript_EffectHealPulse:
jumpifstatus3 BS_TARGET, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents jumpifstatus3 BS_TARGET, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifsubstituteblocks BattleScript_ButItFailed jumpifsubstituteblocks BattleScript_ButItFailed
tryhealpulse BS_TARGET, BattleScript_AlreadyAtFullHp tryhealpulse BattleScript_AlreadyAtFullHp
attackanimation attackanimation
waitanimation waitanimation
healthbarupdate BS_TARGET healthbarupdate BS_TARGET
@ -3173,23 +3224,8 @@ BattleScript_EffectHitEscape:
moveendfrom MOVEEND_TARGET_VISIBLE moveendfrom MOVEEND_TARGET_VISIBLE
jumpifbattleend BattleScript_HitEscapeEnd jumpifbattleend BattleScript_HitEscapeEnd
jumpifbyte CMP_NOT_EQUAL gBattleOutcome 0, BattleScript_HitEscapeEnd jumpifbyte CMP_NOT_EQUAL gBattleOutcome 0, BattleScript_HitEscapeEnd
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_HitEscapeEnd
jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_HitEscapeEnd
jumpifemergencyexited BS_TARGET, BattleScript_HitEscapeEnd jumpifemergencyexited BS_TARGET, BattleScript_HitEscapeEnd
openpartyscreen BS_ATTACKER, BattleScript_HitEscapeEnd goto BattleScript_MoveSwitch
switchoutabilities BS_ATTACKER
waitstate
switchhandleorder BS_ATTACKER, 2
returntoball BS_ATTACKER
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
trytoclearprimalweather
flushtextbox
printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE
waitstate
switchineffects BS_ATTACKER
BattleScript_HitEscapeEnd: BattleScript_HitEscapeEnd:
end end
@ -4971,9 +5007,7 @@ BattleScript_EffectSandstorm::
attackcanceler attackcanceler
attackstring attackstring
ppreduce ppreduce
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened call BattleScript_CheckPrimalWeather
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
setsandstorm setsandstorm
goto BattleScript_MoveWeatherChange goto BattleScript_MoveWeatherChange
@ -5162,25 +5196,25 @@ BattleScript_EffectRainDance::
attackcanceler attackcanceler
attackstring attackstring
ppreduce ppreduce
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened call BattleScript_CheckPrimalWeather
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
setrain setrain
BattleScript_MoveWeatherChange:: BattleScript_MoveWeatherChange::
attackanimation attackanimation
waitanimation waitanimation
call BattleScript_MoveWeatherChangeRet
goto BattleScript_MoveEnd
BattleScript_MoveWeatherChangeRet::
printfromtable gMoveWeatherChangeStringIds printfromtable gMoveWeatherChangeStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
call BattleScript_ActivateWeatherAbilities call BattleScript_ActivateWeatherAbilities
goto BattleScript_MoveEnd return
BattleScript_EffectSunnyDay:: BattleScript_EffectSunnyDay::
attackcanceler attackcanceler
attackstring attackstring
ppreduce ppreduce
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened call BattleScript_CheckPrimalWeather
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
setsunny setsunny
goto BattleScript_MoveWeatherChange goto BattleScript_MoveWeatherChange
@ -5644,9 +5678,7 @@ BattleScript_EffectHail::
attackcanceler attackcanceler
attackstring attackstring
ppreduce ppreduce
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened call BattleScript_CheckPrimalWeather
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
sethail sethail
goto BattleScript_MoveWeatherChange goto BattleScript_MoveWeatherChange
@ -10771,9 +10803,7 @@ BattleScript_BerserkGeneRet_End:
BattleScript_EffectSnow:: BattleScript_EffectSnow::
attackcanceler attackcanceler
attackstring attackstring
ppreduce ppreduce
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened call BattleScript_CheckPrimalWeather
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
setsnow setsnow
goto BattleScript_MoveWeatherChange goto BattleScript_MoveWeatherChange

7
data/event_scripts.s
View File

@ -1005,6 +1005,13 @@ Common_EventScript_LegendaryFlewAway::
release release
end end
EventScript_VsSeekerChargingDone::
special VsSeekerFreezeObjectsAfterChargeComplete
waitstate
special VsSeekerResetObjectMovementAfterChargeComplete
releaseall
end
.include "data/scripts/pc_transfer.inc" .include "data/scripts/pc_transfer.inc"
.include "data/scripts/questionnaire.inc" .include "data/scripts/questionnaire.inc"
.include "data/scripts/abnormal_weather.inc" .include "data/scripts/abnormal_weather.inc"

16
data/field_effect_scripts.s
View File

@ -1,3 +1,4 @@
#include "config/item.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
@ -72,6 +73,9 @@ gFieldEffectScriptPointers::
.4byte gFieldEffectScript_RayquazaSpotlight @ FLDEFF_RAYQUAZA_SPOTLIGHT .4byte gFieldEffectScript_RayquazaSpotlight @ FLDEFF_RAYQUAZA_SPOTLIGHT
.4byte gFieldEffectScript_DestroyDeoxysRock @ FLDEFF_DESTROY_DEOXYS_ROCK .4byte gFieldEffectScript_DestroyDeoxysRock @ FLDEFF_DESTROY_DEOXYS_ROCK
.4byte gFieldEffectScript_MoveDeoxysRock @ FLDEFF_MOVE_DEOXYS_ROCK .4byte gFieldEffectScript_MoveDeoxysRock @ FLDEFF_MOVE_DEOXYS_ROCK
.4byte gFldEffScript_UseVsSeeker @ FLDEFF_USE_VS_SEEKER
.4byte gFldEffScript_XIcon @ FLDEFF_X_ICON
.4byte gFldEffScript_DoubleExclMarkIcon @ FLDEFF_DOUBLE_EXCL_MARK_ICON
gFieldEffectScript_ExclamationMarkIcon1:: gFieldEffectScript_ExclamationMarkIcon1::
field_eff_callnative FldEff_ExclamationMarkIcon field_eff_callnative FldEff_ExclamationMarkIcon
@ -343,3 +347,15 @@ gFieldEffectScript_DestroyDeoxysRock::
gFieldEffectScript_MoveDeoxysRock:: gFieldEffectScript_MoveDeoxysRock::
field_eff_callnative FldEff_MoveDeoxysRock field_eff_callnative FldEff_MoveDeoxysRock
field_eff_end field_eff_end
gFldEffScript_UseVsSeeker::
field_eff_callnative FldEff_UseVsSeeker
field_eff_end
gFldEffScript_XIcon::
field_eff_callnative FldEff_XIcon
field_eff_end
gFldEffScript_DoubleExclMarkIcon::
field_eff_callnative FldEff_DoubleExclMarkIcon
field_eff_end

27
data/scripts/debug.inc
View File

@ -95,19 +95,6 @@ Debug_BoxFilledMessage::
Debug_BoxFilledMessage_Text: Debug_BoxFilledMessage_Text:
.string "Storage boxes filled!$" .string "Storage boxes filled!$"
Debug_FlagsAndVarNotSetBattleConfigMessage::
lockall
message Debug_FlagsAndVarNotSetBattleConfigMessage_Text
waitmessage
waitbuttonpress
releaseall
end
Debug_FlagsAndVarNotSetBattleConfigMessage_Text:
.string "Feature unavailable! Please define a\n"
.string "usable flag and a usable var in:\l"
.string "'include/config/battle.h'!$"
Debug_EventScript_Script_1:: Debug_EventScript_Script_1::
end end
@ -247,3 +234,17 @@ DebugText_BerryWeedsDisabled:
.string "Unable to force weeds onto berry trees.$" .string "Unable to force weeds onto berry trees.$"
.endif .endif
Debug_FlagsAndVarNotSetBattleConfigMessage::
lockall
message Debug_FlagsAndVarNotSetBattleConfigMessage_Text
waitmessage
waitbuttonpress
releaseall
end
Debug_FlagsAndVarNotSetBattleConfigMessage_Text:
.string "Feature unavailable! Please define a\n"
.string "usable flag and a usable var in:\l"
.string "'include/config/battle.h'!$"

2
data/specials.inc
View File

@ -540,6 +540,8 @@ gSpecials::
def_special GetSprayId def_special GetSprayId
def_special GetLastUsedSprayType def_special GetLastUsedSprayType
def_special TrySkyBattle def_special TrySkyBattle
def_special VsSeekerResetObjectMovementAfterChargeComplete
def_special VsSeekerFreezeObjectsAfterChargeComplete
def_special PlayerHasMulch def_special PlayerHasMulch
def_special Bag_ChooseMulch def_special Bag_ChooseMulch
def_special ObjectEventInteractionApplyMulch def_special ObjectEventInteractionApplyMulch

15
data/text/trainers.inc
View File

@ -4779,3 +4779,18 @@ Route134_Text_HudsonPostBattle:
.string "Our boat drifted out to sea.\p" .string "Our boat drifted out to sea.\p"
.string "My buddy's a timid fellow, so I'm\n" .string "My buddy's a timid fellow, so I'm\n"
.string "worried about him.$" .string "worried about him.$"
VSSeeker_Text_BatteryNotChargedNeedXSteps::
.string "The battery isn't charged enough.\p"
.string "No. of steps required to fully\n"
.string "charge the battery: {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
VSSeeker_Text_NoTrainersWithinRange::
.string "There are no Trainers within range\n"
.string "who can battle…\p"
.string "The VS Seeker was turned off.{PAUSE_UNTIL_PRESS}$"
VSSeeker_Text_TrainersNotReady::
.string "The other Trainers don't appear\n"
.string "to be ready for battle.\p"
.string "Let's wait till later.{PAUSE_UNTIL_PRESS}$"

BIN
graphics/field_effects/pics/emote_x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 B

BIN
graphics/field_effects/pics/emotion_double_exclamation.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 173 B

BIN
graphics/pokemon/chansey/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/chansey/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 591 B

After

Width:  |  Height:  |  Size: 654 B

26
graphics/pokemon/chansey/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
230 123 131 255 255 255
139 65 65 230 222 189
255 230 230
255 213 222
139 65 65
238 123 123
246 164 156
248 248 248
16 16 16
139 65 65
246 164 180
172 164 115 172 164 115
115 106 74 115 106 74
230 222 189 238 123 123
0 0 0 225 96 96
16 16 16
139 65 65
246 164 156
238 123 123
255 230 230
255 213 222
246 164 180
230 123 131
139 65 65

30
graphics/pokemon/chansey/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 152 160 208
192 160 88 255 255 255
112 88 56 230 222 189
248 240 224 172 164 115
248 232 200 115 106 74
80 112 56 141 215 40
128 176 64 106 164 32
152 216 72
248 248 248
16 16 16 16 16 16
80 112 56 88 128 64
232 200 144 148 222 49
168 160 112 106 164 32
112 104 72 255 246 230
224 216 184 255 238 205
0 0 0 238 205 148
213 172 90
139 106 65

BIN
graphics/pokemon/cloyster/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
graphics/pokemon/cloyster/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 752 B

After

Width:  |  Height:  |  Size: 803 B

20
graphics/pokemon/cloyster/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
123 82 131
213 189 238 213 189 238
172 123 189 172 123 189
148 98 180
123 82 131
74 32 82 74 32 82
16 16 16 164 123 189
197 197 197
65 65 65
248 248 248
148 148 148
98 98 98
82 41 90
131 90 164 131 90 164
106 65 131 106 65 131
164 123 189 82 41 90
120 96 176 197 197 197
148 148 148
98 98 98
65 65 65
16 16 16
255 255 255

28
graphics/pokemon/cloyster/shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
48 96 152 139 197 255
152 200 248 90 156 230
104 152 208 98 123 213
16 64 112 41 98 172
0 57 131
164 123 189
131 90 164
106 65 131
82 41 90
197 197 197
148 148 148
98 98 98
65 65 65
16 16 16 16 16 16
192 192 192 255 255 255
64 64 64
248 248 248
144 144 144
96 96 96
80 40 88
128 88 160
104 64 128
128 88 160
96 120 208

BIN
graphics/pokemon/cubone/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 835 B

After

Width:  |  Height:  |  Size: 924 B

BIN
graphics/pokemon/cubone/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 693 B

After

Width:  |  Height:  |  Size: 756 B

26
graphics/pokemon/cubone/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
139 131 106 222 189 106
248 248 248
41 41 41
197 197 213
82 82 57
148 106 90
197 156 74 197 156 74
148 106 90
82 57 16 82 57 16
200 168 136 255 255 255
240 208 176 230 230 238
224 224 232 197 197 213
0 0 0 139 131 106
0 0 0 82 82 57
0 0 0 255 222 180
0 0 0 246 213 180
205 172 139
255 0 255
255 0 255
16 16 16

32
graphics/pokemon/cubone/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 152 160 208
128 128 112 156 172 106
248 248 248 106 139 74
16 16 16 74 98 49
200 184 184 32 65 0
72 80 72 255 255 255
80 104 48 230 222 222
112 144 80 205 189 189
32 56 8 131 131 115
184 160 136 74 82 74
224 208 176 238 222 180
224 216 216 230 213 180
0 0 0 189 164 139
0 0 0 255 0 255
0 0 0 255 0 255
0 0 0 41 41 41

BIN
graphics/pokemon/dewgong/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/dewgong/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 497 B

After

Width:  |  Height:  |  Size: 572 B

24
graphics/pokemon/dewgong/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
153 210 164 153 210 164
230 230 246
213 205 238
156 164 189
106 123 164 106 123 164
65 82 98 65 82 98
156 164 189 213 41 32
230 230 246 156 0 0
16 16 16 255 0 255
213 205 238 255 0 255
255 255 255 255 0 255
255 0 255
213 205 205
131 123 123 131 123 123
112 40 40 16 16 16
232 128 120 255 255 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

24
graphics/pokemon/dewgong/shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
153 210 164 153 210 164
246 246 230
213 213 197
180 180 164
148 148 115 148 148 115
98 98 74 98 98 74
180 180 164 213 41 32
246 246 230 156 0 0
16 16 16 255 0 255
213 213 197 255 0 255
255 255 255 255 0 255
255 0 255
213 205 205
131 123 123 131 123 123
163 32 32 16 16 16
219 83 78 255 255 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon/dodrio/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
graphics/pokemon/dodrio/anim_frontf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
graphics/pokemon/dodrio/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 790 B

After

Width:  |  Height:  |  Size: 889 B

BIN
graphics/pokemon/dodrio/backf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 860 B

After

Width:  |  Height:  |  Size: 904 B

20
graphics/pokemon/dodrio/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
65 65 65 238 197 115
16 16 16 205 156 82
131 131 131
164 123 90 164 123 90
90 65 32 90 65 32
205 156 82
248 248 248
98 90 65
238 222 172 238 222 172
180 164 123 180 164 123
180 65 65 98 90 65
246 131 164
180 65 65
246 131 164
255 213 230 255 213 230
246 131 164
180 65 65
213 205 205
131 131 131
65 65 65
0 0 0
255 255 255

32
graphics/pokemon/dodrio/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 152 160 208
64 64 64 197 222 90
16 16 16 164 189 49
128 128 128 115 139 16
112 136 24 74 106 0
64 88 16 255 246 139
160 184 48 222 164 57
248 248 248 164 106 0
152 104 24 255 213 230
248 240 136 246 131 164
216 160 64 180 65 65
176 80 80 213 205 205
240 128 160 131 131 131
176 80 80 65 65 65
240 128 160 0 0 0
248 200 224 255 255 255

BIN
graphics/pokemon/doduo/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 912 B

After

Width:  |  Height:  |  Size: 1015 B

BIN
graphics/pokemon/doduo/anim_frontf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 910 B

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
graphics/pokemon/doduo/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 655 B

BIN
graphics/pokemon/doduo/backf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 563 B

After

Width:  |  Height:  |  Size: 671 B

28
graphics/pokemon/doduo/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
80 56 24 255 0 255
144 104 88 255 0 255
184 136 80 255 0 255
216 168 112 255 0 255
222 172 115
189 139 82
148 106 90
82 57 24
238 222 172
222 189 139
164 131 74
98 82 16
98 98 98
16 16 16 16 16 16
248 248 248 255 255 255
96 80 16
96 96 96
160 128 72
232 216 168
216 184 136
0 0 0
0 0 0
0 0 0
0 0 0

30
graphics/pokemon/doduo/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 152 160 208
80 96 16 255 0 255
112 144 32 255 0 255
168 192 64 255 0 255
192 224 96 255 0 255
197 230 98
172 197 65
115 148 32
90 115 0
238 230 172
222 205 139
164 156 74
98 98 16
98 98 98
16 16 16 16 16 16
248 248 248 255 255 255
96 96 16
96 96 96
160 152 72
232 224 168
216 200 136
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon/drowzee/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/drowzee/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 593 B

After

Width:  |  Height:  |  Size: 647 B

26
graphics/pokemon/drowzee/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
168 136 0
112 88 0
240 232 0
80 56 32
208 168 72
248 232 112
0 0 0 0 0 0
104 80 64 82 57 32
248 248 248 106 82 65
136 32 56 139 115 90
232 56 56 180 156 123
136 112 88 115 90 0
176 152 120 172 139 0
104 80 64 197 164 32
213 172 74
246 238 0
255 238 115
255 255 255
139 32 57
238 57 57
0 0 0 0 0 0

28
graphics/pokemon/drowzee/shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
136 96 104 0 0 0
104 64 72 115 16 32
224 176 192 148 41 74
96 32 48 180 82 98
184 144 152 205 106 123
248 216 232 115 74 82
16 16 16 139 98 106
120 72 88 164 123 131
248 248 248 189 148 156
136 40 64 230 180 197
232 80 80 238 205 222
176 88 104 255 255 255
200 120 136 139 32 57
144 56 80 238 57 57
0 0 0 0 0 0

BIN
graphics/pokemon/electrode/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 790 B

After

Width:  |  Height:  |  Size: 861 B

BIN
graphics/pokemon/electrode/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 523 B

After

Width:  |  Height:  |  Size: 567 B

22
graphics/pokemon/electrode/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
90 82 82 255 255 255
164 156 156
238 238 238 238 238 238
248 248 248
205 205 222 205 205 222
16 16 16 164 156 156
213 49 65 90 82 82
255 82 32 255 0 255
240 160 136
208 128 144
255 172 156
255 131 90 255 131 90
131 16 16 255 82 32
238 65 49 238 65 49
0 0 0 213 49 65
0 0 0 131 16 16
0 0 0 16 16 16
0 0 0

28
graphics/pokemon/electrode/shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
88 80 80 255 255 255
160 152 152 238 238 238
232 232 232 205 205 222
248 248 248 164 156 156
200 200 216 90 82 82
16 16 16 255 0 255
56 72 208
32 112 248
144 168 232 144 168 232
24 48 112 128 136 216
48 96 232 156 205 255
0 0 0 90 164 255
0 0 0 32 115 255
0 0 0 49 98 238
0 0 0 57 74 213
16 49 131
16 16 16

BIN
graphics/pokemon/exeggcute/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/exeggcute/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 513 B

After

Width:  |  Height:  |  Size: 558 B

24
graphics/pokemon/exeggcute/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
197 115 148 255 255 255
139 32 32 222 222 222
255 213 222
16 16 16
255 238 139 255 238 139
205 139 8 205 139 8
248 248 248 16 16 16
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 238 238 255 238 238
222 222 222 255 213 222
224 176 184 230 180 189
232 192 192 197 115 148
0 0 0 139 32 32
0 0 0
0 0 0
0 0 0

28
graphics/pokemon/exeggcute/shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
224 168 40 255 255 255
136 96 24 222 222 222
248 232 88 255 205 74
230 156 0
16 16 16 16 16 16
248 200 72 255 0 255
224 152 0 255 0 255
248 248 248 255 0 255
248 248 160 255 0 255
216 216 216 255 0 255
208 80 64 255 255 189
240 208 64 255 238 16
0 0 0 246 205 16
0 0 0 238 172 0
0 0 0 180 123 0
0 0 0

BIN
graphics/pokemon/exeggutor/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
graphics/pokemon/exeggutor/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 770 B

After

Width:  |  Height:  |  Size: 831 B

28
graphics/pokemon/exeggutor/normal.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
0 176 232 152 160 208
82 98 41 255 255 205
16 16 16 255 246 139
115 172 49 230 172 90
164 106 32
123 82 16
180 156 74
139 115 65
82 65 16
189 255 115 189 255 115
156 213 74 156 213 74
82 65 16 115 172 49
230 172 90 82 98 41
255 246 139 255 255 255
248 248 168 98 98 98
248 248 248 16 16 16
123 82 16
164 106 32
139 115 65
230 172 90
180 156 74

30
graphics/pokemon/exeggutor/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
0 176 232 152 208 160
136 56 24 255 238 164
255 222 106
230 172 90
164 106 32
115 65 16
238 230 74
205 172 0
148 115 0
255 189 106
230 131 74
197 98 57
156 57 16
255 255 255
98 98 98
16 16 16 16 16 16
192 104 64
232 184 120
224 144 96
120 96 24
224 168 88
248 224 136
248 232 160
248 248 248
160 104 32
160 104 32
200 176 40
224 168 88
240 232 96

BIN
graphics/pokemon/farfetchd/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/farfetchd/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 741 B

30
graphics/pokemon/farfetchd/normal.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 152 160 208
132 107 33 255 255 255
90 58 0 213 213 213
181 148 82 230 230 164
197 205 131
255 222 106
246 180 65
189 115 24
205 255 139
65 222 65
0 156 32
216 184 112
180 148 82
131 106 32
90 57 0
16 16 16 16 16 16
0 156 33
230 230 165
66 222 66
197 206 132
214 214 214
230 197 123
248 248 248
206 255 140
255 222 107
247 181 66
189 115 25

26
graphics/pokemon/farfetchd/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 152 160 208
255 255 255
213 213 213
238 230 164
197 197 123
255 213 115
255 180 74
197 115 32
230 255 148
172 230 74
112 152 32
216 184 112
230 136 120
200 104 88 200 104 88
104 56 48 104 56 48
224 136 120
16 16 16 16 16 16
128 168 32
240 232 176
168 224 72
192 192 120
208 208 208
216 184 112
248 248 248
224 248 144
248 208 112
248 176 72
192 120 48

BIN
graphics/pokemon/gastly/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1010 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/gastly/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 705 B

After

Width:  |  Height:  |  Size: 759 B

22
graphics/pokemon/gastly/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
255 255 255
222 222 222
222 82 57
180 41 16
255 0 255
189 148 180
139 98 131
115 74 106
57 41 57
213 172 205 213 172 205
189 148 180 189 148 180
139 98 131 139 98 131
57 41 57 255 0 255
255 0 255
16 16 16 16 16 16
115 74 106
139 98 131
112 72 104
255 255 255
180 41 16
222 82 57
208 168 192
216 216 216
180 41 16
222 82 57

28
graphics/pokemon/gastly/shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
160 224 248 255 255 255
120 192 232 222 222 222
88 152 208 222 82 57
96 24 120 180 41 16
255 0 255
205 164 255
172 123 205
123 74 156
98 24 123
164 230 255
123 197 238
90 156 213
255 0 255
255 0 255
16 16 16 16 16 16
120 72 152
168 120 200
112 72 104
248 248 248
176 40 16
216 80 56
216 80 56
216 216 216
176 40 16
216 80 56

BIN
graphics/pokemon/gengar/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/gengar/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 729 B

After

Width:  |  Height:  |  Size: 775 B

26
graphics/pokemon/gengar/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
90 74 156
180 139 189
16 16 16
148 115 180
74 41 74
123 98 164
255 90 90
255 148 148
189 172 189
255 246 255 255 246 255
106 98 123
222 213 222 222 213 222
168 16 16 106 98 123
72 40 72 255 194 194
0 0 0 255 144 144
248 88 88
189 172 189
255 0 255
255 0 255
120 96 160
176 136 184
144 112 180
90 74 152
74 41 74
16 16 16

28
graphics/pokemon/gengar/shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
88 88 120 255 255 255
144 144 176 222 222 222
16 16 16 106 98 123
120 120 152 255 205 205
56 56 96 238 144 144
184 106 106
189 172 189
255 0 255
255 0 255
104 104 136 104 104 136
184 104 104 148 148 180
232 144 144 123 123 156
184 168 184 90 90 123
248 240 248 57 57 98
104 96 120 16 16 16
216 208 216
136 56 56
72 40 72
0 0 0

BIN
graphics/pokemon/grimer/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/grimer/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 617 B

After

Width:  |  Height:  |  Size: 671 B

26
graphics/pokemon/grimer/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
156 106 156 255 255 255
222 172 222 213 213 222
98 57 123 172 180 189
238 222 238
180 139 180
16 16 16
123 74 131
248 248 248
131 139 156 131 139 156
65 74 90 65 74 90
172 180 189 238 222 238
208 208 216 222 172 222
0 0 0 180 139 180
0 0 0 156 106 156
0 0 0 123 74 131
98 57 123
255 0 255
255 0 255
255 0 255
16 16 16

30
graphics/pokemon/grimer/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 152 160 208
128 176 96 255 255 255
184 224 144 213 213 222
72 120 40 172 180 189
200 240 160 131 139 156
152 200 128 65 74 90
205 246 164
189 230 148
156 205 131
131 180 98
98 148 65
74 123 41
255 0 255
255 0 255
255 0 255
16 16 16 16 16 16
96 144 64
248 248 248
128 136 152
64 72 88
168 176 184
208 208 216
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon/haunter/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 999 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/haunter/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 810 B

28
graphics/pokemon/haunter/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
128 88 136 213 164 222
192 152 200 197 156 205
80 64 96 172 131 197
131 90 139
82 65 98
255 0 255
255 0 255
255 0 255
222 90 164
180 24 98
106 0 0
213 213 213
115 115 115
16 16 16 16 16 16
168 128 192 255 255 255
248 248 248
112 112 112
176 24 96
216 88 160
208 208 208
104 0 0
0 0 0
0 0 0
0 0 0
0 0 0

28
graphics/pokemon/haunter/shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
128 88 112 213 164 230
192 136 208 197 139 213
80 64 104 172 106 213
131 90 115
82 65 106
255 0 255
255 0 255
255 0 255
90 148 255
41 98 213
8 49 164
213 213 213
115 115 115
16 16 16 16 16 16
168 104 208 255 255 255
248 248 248
112 112 112
40 96 208
88 144 248
208 208 208
8 48 160
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon/hitmonchan/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
graphics/pokemon/hitmonchan/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 766 B

After

Width:  |  Height:  |  Size: 824 B

18
graphics/pokemon/hitmonchan/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
90 65 16
205 180 123
16 16 16
164 139 115
238 213 156
255 246 255 255 246 255
98 74 115 222 205 222
197 180 197
164 156 164
98 74 115 98 74 115
189 49 74 189 49 74
255 148 90 255 148 90
230 98 74 230 98 74
189 49 74
139 32 0 139 32 0
164 156 164 238 213 156
197 180 197 205 180 123
232 128 120 164 139 115
90 65 16
16 16 16

30
graphics/pokemon/hitmonchan/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 208 152 160
88 96 24 246 246 255
192 208 96 213 205 222
189 180 197
156 156 164
90 74 115
189 49 74
65 180 255
24 131 213
0 90 180
0 49 148
230 246 139
197 213 98
148 164 65
106 123 8
16 16 16 16 16 16
144 160 64
224 240 136
248 240 248
88 72 112
96 96 168
32 104 176
120 184 224
80 152 200
16 48 112
144 144 152
184 176 192
204 77 77

BIN
graphics/pokemon/hitmonlee/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/hitmonlee/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 773 B

22
graphics/pokemon/hitmonlee/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
131 90 57
164 123 115
205 164 131
98 57 24
238 197 164 238 197 164
205 164 131
164 123 115
131 90 57
98 57 24
255 255 255
213 205 205
115 98 98 115 98 98
41 41 41
248 248 248
208 200 200
90 74 41
189 180 106
238 230 180 238 230 180
189 180 106 189 180 106
240 224 168 90 74 41
0 0 0 238 255 148
197 205 115
115 123 32
41 41 41

32
graphics/pokemon/hitmonlee/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 152 160 208
64 88 0 189 205 74
96 120 16 148 172 41
152 168 56 98 123 8
32 56 8 65 90 0
184 200 88 41 65 0
112 96 96 255 255 255
16 16 16 213 205 205
248 248 248 115 98 98
208 200 200 238 222 180
88 56 40 189 164 106
184 160 104 90 57 41
232 216 176 230 255 148
184 160 104 189 205 115
232 216 176 106 123 32
0 0 0 41 41 41

BIN
graphics/pokemon/hitmontop/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
graphics/pokemon/hitmontop/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 847 B

28
graphics/pokemon/hitmontop/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
144 144 152 255 255 255
96 96 104 255 222 156
248 248 248 222 189 131
200 200 200 180 139 90
72 112 192 131 90 41
96 152 216 139 189 238
136 184 232 98 156 222
80 88 144 74 115 197
128 88 40 82 90 148
197 74 49
123 32 24
205 205 205
148 148 156
98 98 106
16 16 16 16 16 16
216 184 128
176 136 88
248 216 152
0 0 0
0 0 0

28
graphics/pokemon/hitmontop/shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
144 144 152 255 255 255
96 96 104 238 238 230
248 248 248 213 213 197
200 200 200 172 164 156
144 72 160 115 106 82
208 120 200 246 156 222
240 152 216 213 123 205
112 48 96 164 82 180
112 104 80 139 49 123
197 74 49
123 32 24
205 205 205
148 148 156
98 98 106
16 16 16 16 16 16
208 208 192
168 160 152
232 232 224
144 144 152
0 0 0

BIN
graphics/pokemon/hypno/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
graphics/pokemon/hypno/anim_frontf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
graphics/pokemon/hypno/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 793 B

After

Width:  |  Height:  |  Size: 844 B

BIN
graphics/pokemon/hypno/backf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 763 B

After

Width:  |  Height:  |  Size: 866 B

26
graphics/pokemon/hypno/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
136 96 48
104 80 0
240 216 0
0 0 0 0 0 0
176 144 32 106 82 0
88 64 40 180 148 32
248 232 112 222 189 65
216 184 64 246 222 0
128 144 160 255 238 115
80 88 104 90 65 41
248 248 248 139 98 49
152 168 184 164 131 90
200 216 232 82 90 106
160 128 88 131 148 164
156 172 189
205 222 238
255 255 255
0 0 0 0 0 0

26
graphics/pokemon/hypno/shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
136 96 48
136 48 80
232 144 176
16 16 16
168 80 112
88 64 40
248 176 208
200 112 168
160 144 128
104 88 80
248 248 248
184 168 152
232 216 200
0 0 0 0 0 0
139 49 82
172 82 115
205 106 164
238 148 180
255 172 205
90 65 41
128 64 40
136 72 48
106 90 82
164 148 131
189 172 156
238 222 205
255 255 255
0 0 0 0 0 0

BIN
graphics/pokemon/jellicent/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
graphics/pokemon/jellicent/anim_frontf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/kingler/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
graphics/pokemon/kingler/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 729 B

After

Width:  |  Height:  |  Size: 786 B

20
graphics/pokemon/kingler/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
131 41 8 246 197 139
255 139 82 255 139 82
180 90 74 180 90 74
16 16 16 131 41 8
246 197 139
74 49 32
222 172 156
115 82 16
90 65 49
255 246 222 255 246 222
222 172 156
164 106 65 164 106 65
255 255 255 115 82 16
255 16 255
90 65 49
74 49 32
255 16 255
189 189 230 189 189 230
0 0 0 16 16 16
0 0 0 255 255 255

30
graphics/pokemon/kingler/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
152 208 160 152 160 208
64 80 0 180 197 115
136 152 72 139 156 74
104 112 48 106 115 49
74 90 0
230 246 197
205 213 115
148 139 57
106 98 8
255 16 255
90 65 49
74 49 32
255 16 255
222 222 246
16 16 16 16 16 16
176 192 112 255 255 255
56 40 24
200 208 112
104 96 8
88 64 56
224 240 192
144 136 56
248 248 248
184 184 224
0 0 0
0 0 0

Some files were not shown because too many files have changed in this diff Show More