Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests 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
commit eccd2c4a65
No known key found for this signature in database
GPG Key ID: 6F3EB461799AD95E
248 changed files with 6386 additions and 2820 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
asm/macros/battle_script.inc
View File

@ -1366,6 +1366,12 @@
.byte \battler .byte \battler
.endm .endm
.macro trysetoctolock battler:req, failInstr:req
callnative BS_TrySetOctolock
.byte \battler
.4byte \failInstr
.endm
.macro setzeffect .macro setzeffect
callnative BS_SetZEffect callnative BS_SetZEffect
.endm .endm
@ -2087,11 +2093,6 @@
.4byte \failInstr .4byte \failInstr
.endm .endm
.macro setoctolock battler:req, failInstr:req
various \battler, VARIOUS_SET_OCTOLOCK
.4byte \failInstr
.endm
.macro cutonethirdhpraisestats failInstr:req .macro cutonethirdhpraisestats failInstr:req
various BS_ATTACKER, VARIOUS_CUT_1_3_HP_RAISE_STATS various BS_ATTACKER, VARIOUS_CUT_1_3_HP_RAISE_STATS
.4byte \failInstr .4byte \failInstr

109
data/battle_anim_scripts.s
View File

@ -1009,6 +1009,7 @@ gBattleAnims_General::
.4byte General_SaltCureDamage @ B_ANIM_SALT_CURE_DAMAGE .4byte General_SaltCureDamage @ B_ANIM_SALT_CURE_DAMAGE
.4byte General_DynamaxGrowth @ B_ANIM_DYNAMAX_GROWTH .4byte General_DynamaxGrowth @ B_ANIM_DYNAMAX_GROWTH
.4byte General_SetWeather @ B_ANIM_MAX_SET_WEATHER .4byte General_SetWeather @ B_ANIM_MAX_SET_WEATHER
.4byte General_SyrupBombSpeedDrop @ B_ANIM_SYRUP_BOMB_SPEED_DROP
.align 2 .align 2
gBattleAnims_Special:: gBattleAnims_Special::
@ -16524,6 +16525,113 @@ Move_DOUBLE_SHOCK::
blendoff blendoff
end end
Move_SYRUP_BOMB::
createvisualtask AnimTask_SyrupBomb, 0x5
jumpargeq 0x0, FALSE, Move_SYRUP_BOMB_RED
jumpargeq 0x0, TRUE, Move_SYRUP_BOMB_YELLOW
@ Credits to Dat.H A
Move_SYRUP_BOMB_RED:
loadspritegfx ANIM_TAG_SYRUP_BLOB_RED
loadspritegfx ANIM_TAG_SYRUP_SPLAT_RED
loadspritegfx ANIM_TAG_SYRUP_SHELL_RED
call SyrupBombProjectileRed
call SyrupBombProjectileRed
call SyrupBombProjectileRed
call SyrupBombProjectileRed
call SyrupBombProjectileRed
call SyrupBombProjectileRed
call SyrupBombProjectileRed
call SyrupBombProjectileRed
call SyrupBombProjectileRed
call SyrupBombProjectileRed
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(20, 3, 3)
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 27, 20
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20
playsewithpan SE_M_DIG, SOUND_PAN_TARGET
delay 5
createsprite gSyrupBombRedShellSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 100
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -8, -44, 20
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -46, -28, 20
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20
playsewithpan SE_M_DIG, SOUND_PAN_TARGET
delay 5
waitsound
waitforvisualfinish
end
SyrupBombProjectileRed:
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
createsprite gSyrupRedProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0
delay 3
return
Move_SYRUP_BOMB_YELLOW:
loadspritegfx ANIM_TAG_SYRUP_BLOB_YELLOW
loadspritegfx ANIM_TAG_SYRUP_SPLAT_YELLOW
loadspritegfx ANIM_TAG_SYRUP_SHELL_YELLOW
call SyrupBombProjectileYellow
call SyrupBombProjectileYellow
call SyrupBombProjectileYellow
call SyrupBombProjectileYellow
call SyrupBombProjectileYellow
call SyrupBombProjectileYellow
call SyrupBombProjectileYellow
call SyrupBombProjectileYellow
call SyrupBombProjectileYellow
call SyrupBombProjectileYellow
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(23, 13, 1)
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 27, 20
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20
playsewithpan SE_M_DIG, SOUND_PAN_TARGET
delay 5
createsprite gSyrupBombYellowShellSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 100
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -8, -44, 20
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -46, -28, 20
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20
playsewithpan SE_M_DIG, SOUND_PAN_TARGET
delay 5
waitsound
waitforvisualfinish
end
SyrupBombProjectileYellow:
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
createsprite gSyrupYellowProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0
delay 3
return
General_SyrupBombSpeedDrop::
createvisualtask AnimTask_StickySyrup, 0x5
jumpargeq 0x0, FALSE, SyrupBombSpeedDropRed
jumpargeq 0x0, TRUE, SyrupBombSpeedDropYellow
SyrupBombSpeedDropRed:
loadspritegfx ANIM_TAG_SYRUP_BLOB_RED
loadspritegfx ANIM_TAG_SYRUP_SHELL_RED
loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 13, 6
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(20, 3, 3)
createsprite gSyrupBombRedShellBSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 60
waitforvisualfinish
end
SyrupBombSpeedDropYellow:
loadspritegfx ANIM_TAG_SYRUP_BLOB_YELLOW
loadspritegfx ANIM_TAG_SYRUP_SHELL_YELLOW
loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 13, 6
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(23, 13, 1)
createsprite gSyrupBombYellowShellBSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 60
waitforvisualfinish
end
Move_TERA_BLAST:: Move_TERA_BLAST::
Move_AXE_KICK:: Move_AXE_KICK::
Move_LAST_RESPECTS:: Move_LAST_RESPECTS::
@ -16572,7 +16680,6 @@ Move_PSYBLADE::
Move_HYDRO_STEAM:: Move_HYDRO_STEAM::
Move_BLOOD_MOON:: Move_BLOOD_MOON::
Move_MATCHA_GOTCHA:: Move_MATCHA_GOTCHA::
Move_SYRUP_BOMB::
Move_IVY_CUDGEL:: Move_IVY_CUDGEL::
end @to do end @to do

75
data/battle_scripts_1.s
View File

@ -446,33 +446,21 @@ BattleScript_EffectSyrupBomb::
call BattleScript_EffectHit_Ret call BattleScript_EffectHit_Ret
seteffectwithchance seteffectwithchance
tryfaintmon BS_TARGET tryfaintmon BS_TARGET
printstring STRINGID_TARGETCOVEREDINSTICKYCANDYSYRUP
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_SyrupBombActivates::
printstring STRINGID_TARGETCOVEREDINSTICKYCANDYSYRUP
waitmessage B_WAIT_TIME_LONG
return
BattleScript_SyrupBombEndTurn:: BattleScript_SyrupBombEndTurn::
setbyte sSTAT_ANIM_PLAYED, FALSE flushtextbox
copybyte sBATTLER, gBattlerTarget playanimation BS_ATTACKER, B_ANIM_SYRUP_BOMB_SPEED_DROP
jumpifholdeffect BS_TARGET, HOLD_EFFECT_CLEAR_AMULET, BattleScript_SyrupBombItemNoStatLoss
jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_SyrupBombAbilityNoStatLoss
jumpifability BS_TARGET, ABILITY_FULL_METAL_BODY, BattleScript_SyrupBombAbilityNoStatLoss
jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_SyrupBombAbilityNoStatLoss
jumpifstat BS_TARGET, CMP_GREATER_THAN, BIT_SPEED, MIN_STAT_STAGE, BattleScript_SyrupBombLowerSpeed
goto BattleScript_SyrupBombEnd2
BattleScript_SyrupBombLowerSpeed:
playstatchangeanimation BS_ATTACKER, BIT_SPEED, STAT_CHANGE_NEGATIVE
setbyte sSTAT_ANIM_PLAYED, TRUE
setstatchanger STAT_SPEED, 1, TRUE setstatchanger STAT_SPEED, 1, TRUE
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_SyrupBombEnd2 statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_SyrupBombTurnDmgEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_SyrupBombEnd2
printfromtable gStatDownStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_SyrupBombItemNoStatLoss:: BattleScript_SyrupBombTurnDmgEnd:
call BattleScript_ItemNoStatLoss
goto BattleScript_SyrupBombEnd2
BattleScript_SyrupBombAbilityNoStatLoss::
call BattleScript_AbilityNoStatLoss
BattleScript_SyrupBombEnd2::
end2 end2
BattleScript_EffectMatchaGotcha:: BattleScript_EffectMatchaGotcha::
@ -1073,7 +1061,7 @@ BattleScript_EffectOctolock:
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring attackstring
ppreduce ppreduce
setoctolock BS_TARGET, BattleScript_ButItFailed trysetoctolock BS_TARGET, BattleScript_ButItFailed
attackanimation attackanimation
waitanimation waitanimation
printstring STRINGID_CANTESCAPEBECAUSEOFCURRENTMOVE printstring STRINGID_CANTESCAPEBECAUSEOFCURRENTMOVE
@ -1081,29 +1069,19 @@ BattleScript_EffectOctolock:
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_OctolockEndTurn:: BattleScript_OctolockEndTurn::
setbyte sSTAT_ANIM_PLAYED, FALSE
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_DEF, MIN_STAT_STAGE, BattleScript_OctolockLowerDef
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_SPDEF, MIN_STAT_STAGE, BattleScript_OctolockTryLowerSpDef
goto BattleScript_OctolockEnd2
BattleScript_OctolockLowerDef:
jumpifability BS_TARGET, ABILITY_BIG_PECKS, BattleScript_OctolockTryLowerSpDef
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_NEGATIVE playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_NEGATIVE
setbyte sSTAT_ANIM_PLAYED, TRUE
setstatchanger STAT_DEF, 1, TRUE setstatchanger STAT_DEF, 1, TRUE
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_OctolockTryLowerSpDef statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_OctolockTryLowerSpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_OctolockTryLowerSpDef BattleScript_OctolockTryLowerDef:
printfromtable gStatUpStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_OctolockTryLowerSpDef: BattleScript_OctolockTryLowerSpDef:
jumpifbyte CMP_EQUAL, sSTAT_ANIM_PLAYED, TRUE, BattleScript_OctolockSkipSpDefAnim
playstatchangeanimation BS_ATTACKER, BIT_SPDEF, STAT_CHANGE_NEGATIVE
BattleScript_OctolockSkipSpDefAnim:
setstatchanger STAT_SPDEF, 1, TRUE setstatchanger STAT_SPDEF, 1, TRUE
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_OctolockEnd2 statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_OctlockTurnDmgEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_OctolockEnd2 BattleScript_OctolockTurnDmgPrintMsg:
printfromtable gStatUpStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_OctolockEnd2:: BattleScript_OctlockTurnDmgEnd:
end2 end2
BattleScript_EffectPoltergeist: BattleScript_EffectPoltergeist:
@ -8578,13 +8556,6 @@ BattleScript_IntimidateLoop:
jumpiftargetally BattleScript_IntimidateLoopIncrement jumpiftargetally BattleScript_IntimidateLoopIncrement
jumpifabsent BS_TARGET, BattleScript_IntimidateLoopIncrement jumpifabsent BS_TARGET, BattleScript_IntimidateLoopIncrement
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_IntimidateLoopIncrement jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_IntimidateLoopIncrement
jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented
.if B_UPDATED_INTIMIDATE >= GEN_8
jumpifability BS_TARGET, ABILITY_INNER_FOCUS, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_SCRAPPY, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_OBLIVIOUS, BattleScript_IntimidatePrevented
.endif
jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_IntimidateInReverse jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_IntimidateInReverse
BattleScript_IntimidateEffect: BattleScript_IntimidateEffect:
copybyte sBATTLER, gBattlerAttacker copybyte sBATTLER, gBattlerAttacker
@ -8617,16 +8588,6 @@ BattleScript_IntimidateContrary_WontIncrease:
printstring STRINGID_TARGETSTATWONTGOHIGHER printstring STRINGID_TARGETSTATWONTGOHIGHER
goto BattleScript_IntimidateEffect_WaitString goto BattleScript_IntimidateEffect_WaitString
BattleScript_IntimidatePrevented:
call BattleScript_AbilityPopUp
pause B_WAIT_TIME_LONG
setbyte gBattleCommunication STAT_ATK
stattextbuffer BS_TARGET
printstring STRINGID_STATWASNOTLOWERED
waitmessage B_WAIT_TIME_LONG
call BattleScript_TryAdrenalineOrb
goto BattleScript_IntimidateLoopIncrement
BattleScript_IntimidateInReverse: BattleScript_IntimidateInReverse:
copybyte sBATTLER, gBattlerTarget copybyte sBATTLER, gBattlerTarget
call BattleScript_AbilityPopUpTarget call BattleScript_AbilityPopUpTarget
@ -8933,7 +8894,7 @@ BattleScript_AbilityNoStatLoss::
BattleScript_ItemNoStatLoss:: BattleScript_ItemNoStatLoss::
pause B_WAIT_TIME_SHORT pause B_WAIT_TIME_SHORT
printstring STRINGID_STATWASNOTLOWERED printstring STRINGID_CLEARAMULETWONTLOWERSTATS
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
return return

25
data/contest_ai_scripts.s
View File

@ -1,3 +1,4 @@
#include "config.h"
#include "constants/global.h" #include "constants/global.h"
#include "constants/contest.h" #include "constants/contest.h"
.include "asm/macros.inc" .include "asm/macros.inc"
@ -435,11 +436,11 @@ AI_CGM_BetterWhenAudienceExcited:
AI_CGM_BetterWhenAudienceExcited_1stUp: AI_CGM_BetterWhenAudienceExcited_1stUp:
@ BUG: Should be if_appeal_num_eq 0 @ BUG: Should be if_appeal_num_eq 0
@ 1st up on 1st appeal excitement will always be 0 @ 1st up on 1st appeal excitement will always be 0
.ifdef BUGFIX #ifdef BUGFIX
if_appeal_num_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal if_appeal_num_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
.else #else
if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
.endif #endif
if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax
if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax
end end
@ -546,11 +547,11 @@ AI_CGM_TargetMonWithJudgesAttention:
end end
AI_CGM_TargetMonWithJudgesAttention_CheckMon1: AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.ifdef BUGFIX #ifdef BUGFIX
if_not_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_not_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.else #else
if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.endif #endif
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
score +2 score +2
if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
@ -559,11 +560,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
AI_CGM_TargetMonWithJudgesAttention_CheckMon2: AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
if_user_order_eq MON_2, AI_CGM_End if_user_order_eq MON_2, AI_CGM_End
if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.ifdef BUGFIX #ifdef BUGFIX
if_not_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_not_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.else #else
if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.endif #endif
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
score +2 score +2
if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
@ -572,11 +573,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
AI_CGM_TargetMonWithJudgesAttention_CheckMon3: AI_CGM_TargetMonWithJudgesAttention_CheckMon3:
if_user_order_eq MON_3, AI_CGM_End if_user_order_eq MON_3, AI_CGM_End
if_cannot_participate MON_3, AI_CGM_End if_cannot_participate MON_3, AI_CGM_End
.ifdef BUGFIX #ifdef BUGFIX
if_not_used_combo_starter MON_3, AI_CGM_End if_not_used_combo_starter MON_3, AI_CGM_End
.else #else
if_used_combo_starter MON_3, AI_CGM_End if_used_combo_starter MON_3, AI_CGM_End
.endif #endif
if_random_less_than 125, AI_CGM_End if_random_less_than 125, AI_CGM_End
score +2 score +2
if_not_completed_combo MON_3, AI_CGM_End if_not_completed_combo MON_3, AI_CGM_End

1
data/event_scripts.s
View File

@ -1,3 +1,4 @@
#include "config.h"
#include "config/battle.h" #include "config/battle.h"
#include "config/item.h" #include "config/item.h"
#include "constants/global.h" #include "constants/global.h"

10
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
View File

@ -415,18 +415,18 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge::
@ to the flash, but not data in PokemonStorage. The SaveGame script that follows asks the player to do a full save, @ to the flash, but not data in PokemonStorage. The SaveGame script that follows asks the player to do a full save,
@ which they can opt out of. As a result the player can save their party and quit without having saved the PC. @ which they can opt out of. As a result the player can save their party and quit without having saved the PC.
@ This allows players to clone pokemon and their held items by withdrawing them (or erase them by despositing). @ This allows players to clone pokemon and their held items by withdrawing them (or erase them by despositing).
.ifndef BUGFIX #ifndef BUGFIX
tower_save 0 tower_save 0
.endif #endif
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_CHALLENGE_STATUS, 255 setvar VAR_TEMP_CHALLENGE_STATUS, 255
goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
@ GAME_STAT_ENTERED_BATTLE_TOWER should not be incremented here, for two reasons: @ GAME_STAT_ENTERED_BATTLE_TOWER should not be incremented here, for two reasons:
@ 1. It is incremented again in BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful or BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful @ 1. It is incremented again in BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful or BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful
@ 2. If the player tries to save, but fails, the counter will still be incremented even if the player never enters the tower. @ 2. If the player tries to connect, but fails, the counter will still be incremented even if the player never enters the tower.
.ifndef BUGFIX #ifndef BUGFIX
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
.endif #endif
specialvar VAR_RESULT, IsWirelessAdapterConnected specialvar VAR_RESULT, IsWirelessAdapterConnected
goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink
goto BattleFrontier_BattleTowerLobby_EventScript_TryCableLink goto BattleFrontier_BattleTowerLobby_EventScript_TryCableLink

6
data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
View File

@ -229,11 +229,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt2::
copyobjectxytoperm LOCALID_STAIR_GRUNT copyobjectxytoperm LOCALID_STAIR_GRUNT
switch VAR_FACING switch VAR_FACING
case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest
#ifdef BUGFIX #ifdef BUGFIX
case DIR_EAST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast case DIR_EAST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
#else #else
case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
#endif #endif
applymovement LOCALID_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs applymovement LOCALID_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs
waitmovement 0 waitmovement 0
setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2 setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2

4
data/scripts/trainer_hill.inc
View File

@ -13,9 +13,9 @@ TrainerHill_OnWarp:
TrainerHill_1F_EventScript_DummyOnWarp:: TrainerHill_1F_EventScript_DummyOnWarp::
setvar VAR_TEMP_3, 1 setvar VAR_TEMP_3, 1
.ifdef BUGFIX #ifdef BUGFIX
end @ Missing end. By chance, the next byte (0x02 of VAR_TEMP_2) is also the id for the end cmd end @ Missing end. By chance, the next byte (0x02 of VAR_TEMP_2) is also the id for the end cmd
.endif #endif
TrainerHill_OnFrame: TrainerHill_OnFrame:
map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter

BIN
graphics/battle_anims/sprites/syrup_bomb_blob.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
graphics/battle_anims/sprites/syrup_bomb_shell.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
graphics/battle_anims/sprites/syrup_bomb_splat.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

19
graphics/battle_anims/sprites/syrup_red.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
30 255 0
242 242 242
255 194 173
255 129 110
224 51 38
161 24 26
110 30 36
13 2 4
200 224 240
200 224 240
200 224 240
200 224 240
200 224 240
200 224 240
200 224 240
200 224 240

19
graphics/battle_anims/sprites/syrup_yellow.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
30 255 0
242 242 242
255 255 168
255 235 82
255 192 0
185 104 4
107 59 19
13 2 4
200 224 240
200 224 240
200 224 240
200 224 240
200 224 240
200 224 240
200 224 240
200 224 240

19
graphics/pokemon/alcremie/berry/Berry_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Rainbow_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 184
208 192 120
216 144 88
120 88 64
240 160 168
208 128 136
176 232 224
128 160 168
248 248 112
216 192 40
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
0 120 200
0 80 144
0 40 104
0 0 0

19
graphics/pokemon/alcremie/berry/Berry_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
0 120 200
0 80 144
0 40 104
0 0 0

24
graphics/pokemon/alcremie/mint_cream/shiny.pal → graphics/pokemon/alcremie/berry/Berry_Shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72 72 80 72
248 248 248 248 248 248
88 88 96 168 176 176
128 128 128 248 248 248
168 176 176
248 248 248
168 176 176
0 120 200
0 80 144
0 40 104
16 16 16 16 16 16
152 152 152
136 32 56
248 88 112
192 48 72
168 176 176
168 176 176
216 216 216
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon/alcremie/berry/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 651 B

BIN
graphics/pokemon/alcremie/berry/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 717 B

19
graphics/pokemon/alcremie/clover/Clover_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Rainbow_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 184
208 192 120
216 144 88
120 88 64
240 160 168
208 128 136
176 232 224
128 160 168
248 248 112
216 192 40
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
136 216 64
24 144 36
24 80 36
0 0 0

19
graphics/pokemon/alcremie/clover/Clover_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
136 216 64
24 144 36
24 80 36
0 0 0

22
graphics/pokemon/alcremie/matcha_cream/shiny.pal → graphics/pokemon/alcremie/clover/Clover_Shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72 72 80 72
248 248 248 248 248 248
88 88 96 168 176 176
128 128 128
16 16 16
152 152 152
216 216 216
136 32 56
248 88 112
192 48 72
248 248 248 248 248 248
168 176 176 168 176 176
0 0 0 248 248 248
0 0 0 168 176 176
0 0 0 136 216 64
24 144 36
24 80 36
16 16 16

BIN
graphics/pokemon/alcremie/clover/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 655 B

BIN
graphics/pokemon/alcremie/clover/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

19
graphics/pokemon/alcremie/flower/Flower_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Rainbow_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 184
208 192 120
216 144 88
120 88 64
240 160 168
208 128 136
176 232 224
128 160 168
248 248 112
216 192 40
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
248 248 0
248 104 40
152 56 24
0 0 0

19
graphics/pokemon/alcremie/flower/Flower_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
248 248 0
248 104 40
152 56 24
0 0 0

22
graphics/pokemon/alcremie/ruby_swirl/shiny.pal → graphics/pokemon/alcremie/flower/Flower_Shiny.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72 72 80 72
248 248 248 248 248 248
88 88 96 168 176 176
128 128 128
16 16 16
152 152 152
216 216 216
136 32 56
248 88 112
192 48 72
248 248 248 248 248 248
168 176 176 168 176 176
0 0 0 248 248 248
0 0 0 168 176 176
0 0 0 248 248 0
248 104 40
152 56 24
16 16 16

BIN
graphics/pokemon/alcremie/flower/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 652 B

BIN
graphics/pokemon/alcremie/flower/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 721 B

BIN
graphics/pokemon/alcremie/lemon_cream/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 688 B

BIN
graphics/pokemon/alcremie/lemon_cream/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 738 B

19
graphics/pokemon/alcremie/lemon_cream/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
152 208 160
72 80 72
248 248 248
88 88 96
128 128 128
16 16 16
152 152 152
136 32 56
248 88 112
192 48 72
168 176 176
216 216 216
0 0 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/alcremie/love/Love_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Rainbow_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 184
208 192 120
216 144 88
120 88 64
240 160 168
208 128 136
176 232 224
128 160 168
248 248 112
216 192 40
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
248 152 200
248 112 120
216 56 104
0 0 0

19
graphics/pokemon/alcremie/love/Love_Shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 152 200
248 112 120
216 56 104
16 16 16

BIN
graphics/pokemon/alcremie/love/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 651 B

BIN
graphics/pokemon/alcremie/love/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 723 B

BIN
graphics/pokemon/alcremie/matcha_cream/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 679 B

BIN
graphics/pokemon/alcremie/matcha_cream/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 738 B

BIN
graphics/pokemon/alcremie/mint_cream/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 688 B

BIN
graphics/pokemon/alcremie/mint_cream/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 739 B

19
graphics/pokemon/alcremie/ribbon/Ribbon_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Rainbow_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 184
208 192 120
216 144 88
120 88 64
240 160 168
208 128 136
176 232 224
128 160 168
248 248 112
216 192 40
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
176 136 176
144 96 168
112 72 136
0 0 0

19
graphics/pokemon/alcremie/ribbon/Ribbon_Shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
176 136 176
144 96 168
112 72 136
16 16 16

BIN
graphics/pokemon/alcremie/ribbon/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 650 B

BIN
graphics/pokemon/alcremie/ribbon/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

BIN
graphics/pokemon/alcremie/ruby_cream/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 693 B

BIN
graphics/pokemon/alcremie/ruby_cream/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 742 B

BIN
graphics/pokemon/alcremie/ruby_swirl/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 691 B

BIN
graphics/pokemon/alcremie/ruby_swirl/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 753 B

BIN
graphics/pokemon/alcremie/salted_cream/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 688 B

BIN
graphics/pokemon/alcremie/salted_cream/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 737 B

19
graphics/pokemon/alcremie/salted_cream/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
152 208 160
72 80 72
248 248 248
88 88 96
128 128 128
16 16 16
136 32 56
248 88 112
192 48 72
168 176 176
152 152 152
216 216 216
0 0 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/alcremie/star/Star_Caramel_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 232 184
200 168 120
232 168 96
144 112 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Default.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 224 208
208 160 168
240 136 144
128 80 88
248 224 200
208 128 136
248 224 200
208 160 168
248 224 200
208 160 168
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Lemon_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 152
208 184 72
232 224 0
112 120 24
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Matcha_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 248 208
176 208 152
192 224 96
104 128 80
232 248 200
176 208 152
232 248 200
176 208 152
232 248 200
176 208 152
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Mint_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
208 240 232
152 168 176
112 208 200
72 112 128
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Rainbow_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 248 184
208 192 120
216 144 88
120 88 64
240 160 168
208 128 136
176 232 224
128 160 168
248 248 112
216 192 40
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Ruby_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 208 208
200 152 184
232 112 192
128 80 112
248 208 208
200 152 184
248 208 208
200 152 184
248 208 208
200 152 184
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Ruby_Swirl.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
248 240 208
208 184 160
240 192 128
128 96 80
248 176 192
224 120 128
248 176 192
224 120 128
248 176 192
224 120 128
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Salted_Cream.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
248 248 248
232 232 248
176 176 184
112 208 200
88 88 96
232 232 248
176 176 184
232 232 248
176 176 184
232 232 248
176 176 184
248 224 48
200 176 24
192 112 16
0 0 0

19
graphics/pokemon/alcremie/star/Star_Shiny.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
216 216 216
152 152 152
128 128 128
88 88 96
72 80 72
248 248 248
168 176 176
248 248 248
168 176 176
248 248 248
168 176 176
248 224 48
200 176 24
192 112 16
16 16 16

BIN
graphics/pokemon/alcremie/star/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 650 B

BIN
graphics/pokemon/alcremie/star/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 732 B

20
graphics/pokemon/alcremie/salted_cream/normal.pal → graphics/pokemon/alcremie/strawberry/Strawberry_Caramel_Swirl.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
152 208 160 152 208 160
88 88 88
248 248 248 248 248 248
112 208 200 248 232 184
176 176 176 200 168 120
16 16 16 232 168 96
136 32 56 144 112 72
248 88 112 248 248 248
192 48 72
168 176 176 168 176 176
248 248 248 248 248 248
168 176 176
248 248 248 248 248 248
0 0 0 168 176 176
0 0 0 248 88 112
0 0 0 192 48 72
136 32 56
0 0 0 0 0 0

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